[Erp5-report] r35250 nicolas - /erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed May 12 18:53:24 2010
New Revision: 35250

URL: http://svn.erp5.org?rev=35250&view=rev
Log:
Use VALID_IMAGE_FORMAT_LIST from its new location

Modified:
    erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=35250&r1=35249&r2=35250&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Wed May 12 18:53:24 2010
@@ -59,7 +59,6 @@
 dec=base64.decodestring
 
 _MARKER = []
-STANDARD_IMAGE_FORMAT_LIST = ('png', 'jpg', 'gif', 'tiff', )
 
 class TimeoutTransport(SafeTransport):
   """A xmlrpc transport with configurable timeout.
@@ -325,7 +324,7 @@
       format_list = [x for x in self.getTargetFormatList()
                                           if x.endswith('pdf')]
       format = format_list[0]
-    elif format in STANDARD_IMAGE_FORMAT_LIST:
+    elif format in VALID_IMAGE_FORMAT_LIST:
       format_list = [x for x in self.getTargetFormatList()
                                           if x.endswith(format)]
       if len(format_list):
@@ -369,7 +368,7 @@
         has_format = self.hasConversion(format=original_format)
       else:
         has_format = self.hasConversion(format=original_format, display=display)
-    elif display is None or original_format not in STANDARD_IMAGE_FORMAT_LIST:
+    elif display is None or original_format not in VALID_IMAGE_FORMAT_LIST:
       has_format = self.hasConversion(format=original_format)
     else:
       has_format = self.hasConversion(format=original_format, display=display)
@@ -395,7 +394,7 @@
                                          # better usability
         z.close()
         cs.close()
-      if (display is None or original_format not in STANDARD_IMAGE_FORMAT_LIST) \
+      if (display is None or original_format not in VALID_IMAGE_FORMAT_LIST) \
         and not requires_pdf_first:
         self.setConversion(data, mime, format=original_format)
       else:
@@ -416,7 +415,7 @@
             self.setConversion(data, mime, format=original_format, display=display)
     if requires_pdf_first:
       format = original_format
-    if display is None or original_format not in STANDARD_IMAGE_FORMAT_LIST:
+    if display is None or original_format not in VALID_IMAGE_FORMAT_LIST:
       return self.getConversion(format=original_format)
     else:
       return self.getConversion(format=original_format, display=display)