[Checkins] SVN: zopyx.smartprintng.server/trunk/ include conversion output with zip file

Andreas Jung andreas at andreas-jung.com
Sat May 15 10:37:33 EDT 2010


Log message for revision 112334:
  include conversion output with zip file
  

Changed:
  U   zopyx.smartprintng.server/trunk/docs/HISTORY.txt
  U   zopyx.smartprintng.server/trunk/setup.py
  U   zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/models.py

-=-
Modified: zopyx.smartprintng.server/trunk/docs/HISTORY.txt
===================================================================
--- zopyx.smartprintng.server/trunk/docs/HISTORY.txt	2010-05-15 14:21:07 UTC (rev 112333)
+++ zopyx.smartprintng.server/trunk/docs/HISTORY.txt	2010-05-15 14:37:33 UTC (rev 112334)
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.6.6 (2010/05/15)
+------------------
+* include conversion result into ZIP file
+
 0.6.5 (2010/02/04)
 ------------------
 * fixed racing condition in cleanup code

Modified: zopyx.smartprintng.server/trunk/setup.py
===================================================================
--- zopyx.smartprintng.server/trunk/setup.py	2010-05-15 14:21:07 UTC (rev 112333)
+++ zopyx.smartprintng.server/trunk/setup.py	2010-05-15 14:37:33 UTC (rev 112334)
@@ -10,7 +10,7 @@
 if sys.version_info < (2,6):
     raise RuntimeError('Please use Python 2.6.X')
 
-version = '0.6.5'
+version = '0.6.6'
 
 setup(name='zopyx.smartprintng.server',
       version=version,

Modified: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/models.py
===================================================================
--- zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/models.py	2010-05-15 14:21:07 UTC (rev 112333)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/models.py	2010-05-15 14:37:33 UTC (rev 112334)
@@ -140,6 +140,7 @@
         zip_out = os.path.join(tempdir, '%s.zip' % ident)
         ZF = zipfile.ZipFile(zip_out, 'w')
         ZF.writestr('output%s' % ext, file(output_filename, 'rb').read())
+        ZF.writestr('conversion-output.txt', result['output'])
         ZF.close()
 
         LOG.info('Request end (%3.2lf seconds)' % (time.time() - ts))



More information about the checkins mailing list