[Erp5-report] r43639 gabriel - in /erp5/trunk/utils/cloudooo/cloudooo/handler: imagemagick/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Feb 23 22:33:04 CET 2011
Author: gabriel
Date: Wed Feb 23 22:33:04 2011
New Revision: 43639
URL: http://svn.erp5.org?rev=43639&view=rev
Log:
refactor code to use File API
Modified:
erp5/trunk/utils/cloudooo/cloudooo/handler/imagemagick/handler.py
erp5/trunk/utils/cloudooo/cloudooo/handler/pdf/handler.py
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/imagemagick/handler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/imagemagick/handler.py?rev=43639&r1=43638&r2=43639&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/imagemagick/handler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/imagemagick/handler.py [utf8] Wed Feb 23 22:33:04 2011
@@ -54,8 +54,9 @@ class ImageMagickHandler(object):
stdout=PIPE,
stderr=PIPE,
env=self.environment).communicate()
+ self.document.reload(output_url)
try:
- return open(output_url).read()
+ return self.document.getContent()
finally:
self.document.trash()
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/pdf/handler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/pdf/handler.py?rev=43639&r1=43638&r2=43639&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/pdf/handler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/pdf/handler.py [utf8] Wed Feb 23 22:33:04 2011
@@ -53,8 +53,9 @@ class PDFHandler(object):
stdout=PIPE,
stderr=PIPE,
env=self.environment).communicate()
+ self.document.reload(output_url)
try:
- return open(output_url).read()
+ return self.document.getContent()
finally:
self.document.trash()
@@ -104,7 +105,8 @@ class PDFHandler(object):
stdout=PIPE,
stderr=PIPE,
env=self.environment).communicate()
+ self.document.reload(output_url)
try:
- return open(output_url).read()
+ return self.document.getContent()
finally:
self.document.trash()
More information about the Erp5-report
mailing list