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

[nobody at svn.erp5.org]

Author: jm
Date: Wed Oct  7 15:57:34 2009
New Revision: 29450

URL: http://svn.erp5.org?rev=29450&view=rev
Log:
Do not repeat the same list of parameters all the time

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=29450&r1=29449&r2=29450&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Wed Oct  7 15:57:34 2009
@@ -204,18 +204,14 @@
     image_size = self.getSizeFromImageDisplay(display)
     if (display is not None or resolution is not None or quality!=75 or format != ''\
                             or frame is not None) and image_size:
+      kw = dict(display=display, format=format, quality=quality,
+                resolution=resolution, frame=frame, image_size=image_size)
       try:
-        mime, image = self.getConversion(display=display, format=format,
-                                           quality=quality, resolution=resolution,
-                                           frame=frame, image_size=image_size)
+        mime, image = self.getConversion(**kw)
       except KeyError:
         # Generate photo on-the-fly
-        mime, image = self._makeDisplayPhoto(display, format=format, quality=quality,
-                                             resolution=resolution, frame=frame,
-                                             image_size=image_size)
-        self.setConversion(image, mime, display=display, format=format,
-                           quality=quality, resolution=resolution,
-                           frame=frame, image_size=image_size)
+        mime, image = self._makeDisplayPhoto(**kw)
+        self.setConversion(image, mime, **kw)
       width, height = (image.width, image.height)
       # Set cookie for chosen size
       if cookie:
@@ -373,25 +369,20 @@
     """Return the image data."""
     self._upradeImage()
 
-    _setCacheHeaders(_ViewEmulator().__of__(self), dict(display=display,
-        format=format, quality=quality, resolution=resolution, frame=frame))
-
     # display may be set from a cookie (?)
     image_size = self.getSizeFromImageDisplay(display)
+    kw = dict(display=display, format=format, quality=quality,
+              resolution=resolution, frame=frame, image_size=image_size)
+    _setCacheHeaders(_ViewEmulator().__of__(self), kw)
+
     if (display is not None or resolution is not None or quality != 75 or format != ''\
                             or frame is not None) and image_size:
       try:
-        mime, image = self.getConversion(display=display, format=format,
-                                         quality=quality, resolution=resolution,
-                                         frame=frame, image_size=image_size)
+        mime, image = self.getConversion(**kw)
       except KeyError:
         # Generate photo on-the-fly
-        mime, image = self._makeDisplayPhoto(display, format=format, quality=quality,
-                                             resolution=resolution, frame=frame,
-                                             image_size=image_size)
-        self.setConversion(image, mime, display=display, format=format, quality=quality,
-                           resolution=resolution, frame=frame,
-                           image_size=image_size)
+        mime, image = self._makeDisplayPhoto(**kw)
+        self.setConversion(image, mime, **kw)
       RESPONSE.setHeader('Content-Type', mime)
       return image.index_html(REQUEST, RESPONSE)