[Checkins] SVN: zopyx.smartprintng.server/trunk/ merge

Andreas Jung andreas at andreas-jung.com
Sun Sep 6 09:06:28 EDT 2009


Log message for revision 103601:
  merge
  

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	2009-09-06 13:02:38 UTC (rev 103600)
+++ zopyx.smartprintng.server/trunk/docs/HISTORY.txt	2009-09-06 13:06:27 UTC (rev 103601)
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.5.2 (2009/09/05)
+------------------
+* adjusted to newest zopyx.convert2 version
+
 0.5.1 (2009/08/01)
 ------------------
 

Modified: zopyx.smartprintng.server/trunk/setup.py
===================================================================
--- zopyx.smartprintng.server/trunk/setup.py	2009-09-06 13:02:38 UTC (rev 103600)
+++ zopyx.smartprintng.server/trunk/setup.py	2009-09-06 13:06:27 UTC (rev 103601)
@@ -10,7 +10,7 @@
 if sys.version_info < (2,6):
     raise RuntimeError('Please use Python 2.6.X')
 
-version = '0.5.1'
+version = '0.5.2'
 
 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	2009-09-06 13:02:38 UTC (rev 103600)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/models.py	2009-09-06 13:06:27 UTC (rev 103601)
@@ -128,7 +128,7 @@
         result = self._convert(html_filename, 
                                converter_name=converter_name)
         output_filename = result['output_filename']
-        basename, ext = os.path.splitext(output_filename)
+        basename, ext = os.path.splitext(os.path.basename(output_filename))
 
         # Generate result ZIP archive with base64-encoded result
         zip_out = os.path.join(tempdir, '%s.zip' % ident)



More information about the checkins mailing list