[Erp5-report] r29025 - /erp5/trunk/products/ERP5/Document/Image.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Mon Sep 14 11:51:05 2009
New Revision: 29025

URL: http://svn.erp5.org?rev=29025&view=rev
Log:
Remove statement condition, content will never be equal to None

Modified:
    erp5/trunk/products/ERP5/Document/Image.py

Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=29025&r1=29024&r2=29025&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Mon Sep 14 11:51:05 2009
@@ -316,21 +316,17 @@
     mime_type = str(mime_type)
     src_mimetype = self.getContentType()
     content = '%s' % self.getData()
-    if content is not None:
-      portal_transforms = getToolByName(self, 'portal_transforms')
-      result = portal_transforms.convertToData(mime_type, content,
-                                               object=self, context=self,
-                                               filename=self.getTitleOrId(),
-                                               mimetype=src_mimetype)
-      if result is None:
-        # portal_transforms fails to convert.
-        LOG('TextDocument.convert', WARNING,
-            'portal_transforms failed to convert to %s: %r' % (mime_type, self))
-        result = ''
-      return mime_type, result
-    else:
-      # text_content is not set, return empty string instead of None
-      return mime_type, ''
+    portal_transforms = getToolByName(self, 'portal_transforms')
+    result = portal_transforms.convertToData(mime_type, content,
+                                             object=self, context=self,
+                                             filename=self.getTitleOrId(),
+                                             mimetype=src_mimetype)
+    if result is None:
+      # portal_transforms fails to convert.
+      LOG('TextDocument.convert', WARNING,
+          'portal_transforms failed to convert to %s: %r' % (mime_type, self))
+      result = ''
+    return mime_type, result
 
   # Conversion API
   security.declareProtected(Permissions.ModifyPortalContent, 'convert')