pythonreports-checkins

[alexander s. <a1...@us...>]

Update of /cvsroot/pythonreports/PythonReports/PythonReports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5446

Modified Files:
	PILDrivers.py 
Log Message:
sweep pylint warnings

Index: PILDrivers.py
===================================================================
RCS file: /cvsroot/pythonreports/PythonReports/PythonReports/PILDrivers.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PILDrivers.py	1 Nov 2006 17:38:34 -0000	1.2
--- PILDrivers.py	6 Dec 2006 16:52:18 -0000	1.3
***************
*** 1,5 ****
  """Rendering utilities for Python Imaging Library (PIL) backend"""
- 
  """History (most recent first):
  01-nov-2006 [als]   driver classes have backend name property
  05-oct-2006 [als]   use base classes for the rendering drivers
--- 1,5 ----
  """Rendering utilities for Python Imaging Library (PIL) backend"""
  """History (most recent first):
+ 05-dec-2006 [als]   sweep pylint warnings
  01-nov-2006 [als]   driver classes have backend name property
  05-oct-2006 [als]   use base classes for the rendering drivers
***************
*** 13,17 ****
  29-aug-2006 [als]   TextDriver ported from previous implementation
  """
- 
  __version__ = "$Revision$"[11:-2]
  __date__ = "$Date$"[7:-2]
--- 13,16 ----
***************
*** 41,60 ****
      _image = None   # PIL image object (not for external access)
  
-     # "compute once" property, setting object type from image content
      @property
!     def type(self):
          _rv = self._image.format.lower()
!         self.__dict__["type"] = _rv
          return _rv
  
!     # Note: type argument is not used by object factories in PIL driver.
  
      @classmethod
!     def fromfile(cls, filepath, type):
          """Create an image source from existing file
  
          Parameters:
              filepath: full path to the image file
!             type: image type, e.g. "jpeg" or "png"
                  (Note: not used by PIL driver.)
  
--- 40,64 ----
      _image = None   # PIL image object (not for external access)
  
      @property
!     def img_type(self):
!         """image type, e.g. "jpeg" or "png"
! 
!         This is "compute once" property,
!         setting object type from image content.
! 
!         """
          _rv = self._image.format.lower()
!         self.__dict__["img_type"] = _rv
          return _rv
  
!     # Note: img_type argument is not used by object factories in PIL driver.
  
      @classmethod
!     def fromfile(cls, filepath, img_type):
          """Create an image source from existing file
  
          Parameters:
              filepath: full path to the image file
!             img_type: image type, e.g. "jpeg" or "png"
                  (Note: not used by PIL driver.)
  
***************
*** 62,65 ****
--- 66,71 ----
  
          """
+         # pylint: disable-msg=W0613
+         # W0613: Unused argument 'img_type' - the type is guessed from contents
          _rv = cls()
          _rv.filepath = filepath
***************
*** 68,77 ****
  
      @classmethod
!     def fromdata(cls, data, type, name=None):
          """Create an image source from data block
  
          Parameters:
              data: image data
!             type: image type, e.g. "jpeg" or "png"
                  (Note: not used by PIL driver.)
              name: optional name of a report block containing data
--- 74,83 ----
  
      @classmethod
!     def fromdata(cls, data, img_type, name=None):
          """Create an image source from data block
  
          Parameters:
              data: image data
!             img_type: image type, e.g. "jpeg" or "png"
                  (Note: not used by PIL driver.)
              name: optional name of a report block containing data
***************
*** 80,83 ****
--- 86,91 ----
  
          """
+         # pylint: disable-msg=W0613
+         # W0613: Unused argument 'img_type' - the type is guessed from contents
          _rv = cls()
          _rv.name = name
***************
*** 93,101 ****
          return self._image.size
  
!     def getdata(self, type=None):
          """Return image data as string
  
          Parameters:
!             type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
--- 101,109 ----
          return self._image.size
  
!     def getdata(self, img_type=None):
          """Return image data as string
  
          Parameters:
!             img_type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
***************
*** 103,113 ****
  
          """
!         if not type:
!             type = self.preferred_type
          _buffer = StringIO()
!         self._image.save(_buffer, format=type)
          return _buffer.getvalue()
  
!     def scale(self, width, height, type=None):
          """Return a scaled image
  
--- 111,123 ----
  
          """
!         if not img_type:
!             # pylint: disable-msg=C0103
!             # C0103: Invalid name "img_type"
!             img_type = self.preferred_type
          _buffer = StringIO()
!         self._image.save(_buffer, format=img_type)
          return _buffer.getvalue()
  
!     def scale(self, width, height, img_type=None):
          """Return a scaled image
  
***************
*** 115,119 ****
              width: target image width
              height: target image height
!             type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
--- 125,129 ----
              width: target image width
              height: target image height
!             img_type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
***************
*** 121,132 ****
  
          """
!         if not type:
!             type = self.preferred_type
          _img = self._image.resize((width, height), Image.ANTIALIAS)
          _buffer = StringIO()
!         _img.save(_buffer, format=type)
          return _buffer.getvalue()
  
!     def _cut(self, width, height, type):
          """Return an image cut to dimensions
  
--- 131,144 ----
  
          """
!         if not img_type:
!             # pylint: disable-msg=C0103
!             # C0103: Invalid name "img_type"
!             img_type = self.preferred_type
          _img = self._image.resize((width, height), Image.ANTIALIAS)
          _buffer = StringIO()
!         _img.save(_buffer, format=img_type)
          return _buffer.getvalue()
  
!     def _cut(self, width, height, img_type):
          """Return an image cut to dimensions
  
***************
*** 134,138 ****
              width: target image width
              height: target image height
!             type: image type, e.g. "jpeg" or "gif"
  
          Return value: image data as string.
--- 146,150 ----
              width: target image width
              height: target image height
!             img_type: image type, e.g. "jpeg" or "gif"
  
          Return value: image data as string.
***************
*** 146,150 ****
          _img = self._image.crop((0, 0, width, height))
          _buffer = StringIO()
!         _img.save(_buffer, format=type)
          return _buffer.getvalue()
  
--- 158,162 ----
          _img = self._image.crop((0, 0, width, height))
          _buffer = StringIO()
!         _img.save(_buffer, format=img_type)
          return _buffer.getvalue()