From 045bc4b604cd68b8cff1d729bc0f42755d1fcd1a Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Mon, 14 Sep 2009 09:51:05 +0000
Subject: [PATCH] Remove statement condition, content will never be equal to
None
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29025 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5/Document/Image.py | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/product/ERP5/Document/Image.py b/product/ERP5/Document/Image.py
index 0639d94646..9c648d64e3 100644
--- a/product/ERP5/Document/Image.py
+++ b/product/ERP5/Document/Image.py
@@ -316,21 +316,17 @@ class Image(File, OFSImage):
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')
--
2.30.9