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

[nobody at svn.erp5.org]

Author: nicolas
Date: Mon Sep 14 10:32:49 2009
New Revision: 29014

URL: http://svn.erp5.org?rev=29014&view=rev
Log:
reindent code with 2 spaces

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=29014&r1=29013&r2=29014&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Mon Sep 14 10:32:49 2009
@@ -194,68 +194,68 @@
   def tag(self, display=None, height=None, width=None, cookie=0,
                 alt=None, css_class=None, format='', quality=75,
                 resolution=None, frame=None, **kw):
-      """Return HTML img tag."""
-      self._upradeImage()
-
-      # Get cookie if display is not specified.
-      if display is None:
-          display = self.REQUEST.cookies.get('display', None)
-
-      # display may be set from a cookie.
-      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:
-          try:
-              mime, image = self.getConversion(display=display, format=format,
-                                               quality=quality, resolution=resolution,
-                                               frame=frame, image_size=image_size)
-          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)
-          width, height = (image.width, image.height)
-          # Set cookie for chosen size
-          if cookie:
-              self.REQUEST.RESPONSE.setCookie('display', display, path="/")
-      else:
-          # TODO: Add support for on-the-fly resize?
-          height = self.getHeight()
-          width = self.getWidth()
-
-      if display:
-          result = '<img src="%s?display=%s"' % (self.absolute_url(), display)
-      else:
-          result = '<img src="%s"' % (self.absolute_url())
-
-      if alt is None:
-          alt = getattr(self, 'title', '')
-      if alt == '':
-          alt = self.getId()
-      result = '%s alt="%s"' % (result, html_quote(alt))
-
-      if height:
-          result = '%s height="%s"' % (result, height)
-
-      if width:
-          result = '%s width="%s"' % (result, width)
-
-      if not 'border' in map(string.lower, kw.keys()):
-          result = '%s border="0"' % (result)
-
-      if css_class is not None:
-          result = '%s class="%s"' % (result, css_class)
-
-      for key in kw.keys():
-          value = kw.get(key)
-          result = '%s %s="%s"' % (result, key, value)
-
-      result = '%s />' % (result)
-
-      return result
+    """Return HTML img tag."""
+    self._upradeImage()
+
+    # Get cookie if display is not specified.
+    if display is None:
+      display = self.REQUEST.cookies.get('display', None)
+
+    # display may be set from a cookie.
+    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:
+      try:
+        mime, image = self.getConversion(display=display, format=format,
+                                           quality=quality, resolution=resolution,
+                                           frame=frame, image_size=image_size)
+      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)
+      width, height = (image.width, image.height)
+      # Set cookie for chosen size
+      if cookie:
+        self.REQUEST.RESPONSE.setCookie('display', display, path="/")
+    else:
+      # TODO: Add support for on-the-fly resize?
+      height = self.getHeight()
+      width = self.getWidth()
+
+    if display:
+      result = '<img src="%s?display=%s"' % (self.absolute_url(), display)
+    else:
+      result = '<img src="%s"' % (self.absolute_url())
+
+    if alt is None:
+      alt = getattr(self, 'title', '')
+    if alt == '':
+      alt = self.getId()
+    result = '%s alt="%s"' % (result, html_quote(alt))
+
+    if height:
+      result = '%s height="%s"' % (result, height)
+
+    if width:
+      result = '%s width="%s"' % (result, width)
+
+    if not 'border' in map(string.lower, kw.keys()):
+      result = '%s border="0"' % (result)
+
+    if css_class is not None:
+      result = '%s class="%s"' % (result, css_class)
+
+    for key in kw.keys():
+      value = kw.get(key)
+      result = '%s %s="%s"' % (result, key, value)
+
+    result = '%s />' % (result)
+
+    return result
 
   def __str__(self):
       return self.tag()