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

[nobody at svn.erp5.org]

Author: fabien
Date: Wed Dec 30 16:33:32 2009
New Revision: 31540

URL: http://svn.erp5.org?rev=31540&view=rev
Log:
code simplification

the return made in try and in except was the same. Take it of from both and put
it after.

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=31540&r1=31539&r2=31540&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Wed Dec 30 16:33:32 2009
@@ -345,11 +345,10 @@
                 resolution=resolution, frame=frame, image_size=image_size)
       try:
         mime, image = self.getConversion(**kw)
-        return mime, image.data
       except KeyError:
         mime, image = self._makeDisplayPhoto(**kw)
         self.setConversion(image, mime, **kw)
-        return mime, image.data
+      return mime, image.data
     return self.getContentType(), self.getData()
 
   security.declareProtected(Permissions.View, 'getSearchableText')