[Checkins] SVN: zopyx.convert2/trunk/ support for %(WORKDIR)s substitution

[Andreas Jung]

Log message for revision 122676:
  support for %(WORKDIR)s substitution
  

Changed:
  U   zopyx.convert2/trunk/CHANGES.txt
  U   zopyx.convert2/trunk/setup.py
  U   zopyx.convert2/trunk/src/zopyx/convert2/calibre.py

-=-
Modified: zopyx.convert2/trunk/CHANGES.txt
===================================================================
--- zopyx.convert2/trunk/CHANGES.txt	2011-08-23 09:39:54 UTC (rev 122675)
+++ zopyx.convert2/trunk/CHANGES.txt	2011-08-23 10:44:46 UTC (rev 122676)
@@ -1,3 +1,7 @@
+2.3.2 (2011-08-23)
+==================
+- added support for %(WORKDIR)s substitution in Calibre converter
+
 2.3.1 (2011-06-15)
 ==================
 - support for PISA (pdf-pisa-bin) - requires that 'pisa'

Modified: zopyx.convert2/trunk/setup.py
===================================================================
--- zopyx.convert2/trunk/setup.py	2011-08-23 09:39:54 UTC (rev 122675)
+++ zopyx.convert2/trunk/setup.py	2011-08-23 10:44:46 UTC (rev 122676)
@@ -12,7 +12,7 @@
     'Programming Language :: Python',
 ]
 
-version = '2.3.1'
+version = '2.3.2'
 
 desc = unicode(file('README.txt').read().strip(), 'utf-8')
 changes = file('CHANGES.txt').read().strip()

Modified: zopyx.convert2/trunk/src/zopyx/convert2/calibre.py
===================================================================
--- zopyx.convert2/trunk/src/zopyx/convert2/calibre.py	2011-08-23 09:39:54 UTC (rev 122675)
+++ zopyx.convert2/trunk/src/zopyx/convert2/calibre.py	2011-08-23 10:44:46 UTC (rev 122676)
@@ -47,6 +47,7 @@
     else:
         options = ' '.join(options)
         options = options + ' ' + cmdopts
+        options = options % dict(WORKDIR=os.path.dirname(html_filename))
         cmd = '"ebook-convert" "%s" "%s" %s' % (html_filename, output_filename, options)
     
     status, output = runcmd(cmd)