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

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Mar 31 11:47:31 2011
New Revision: 44871

URL: http://svn.erp5.org?rev=44871&view=rev
Log:
Return raw data if explicitely asked for

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=44871&r1=44870&r2=44871&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Thu Mar 31 11:47:31 2011
@@ -269,6 +269,9 @@ class Image(TextConvertableMixin, File, 
         data = aq_base(data)
         self.setConversion(data, mime=mime_type, format=format)
         return mime_type, data
+    if not (format and kw):
+      # User asked for original content
+      return self.getContentType(), self.getData()
     image_size = self.getSizeFromImageDisplay(kw.get('display'))
     # store all keys usefull to convert or resize an image
     # 'display' parameter can be discarded