[PythonReports-checkins] PythonReports/PythonReports drivers.py, 1.5, 1.6

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

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

Index: drivers.py
===================================================================
RCS file: /cvsroot/pythonreports/PythonReports/PythonReports/drivers.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** drivers.py	4 Nov 2006 14:24:01 -0000	1.5
--- drivers.py	6 Dec 2006 16:40:34 -0000	1.6
***************
*** 6,9 ****
--- 6,10 ----
  """
  """History (most recent first):
+ 05-dec-2006 [als]   sweep pylint warnings
  04-nov-2006 [als]   added text driver backend "Tk";
                      have different backend lists for texts and images
***************
*** 15,19 ****
  05-oct-2006 [als]   created
  """
- 
  __version__ = "$Revision$"[11:-2]
  __date__ = "$Date$"[7:-2]
--- 16,19 ----
***************
*** 32,40 ****
  _text_drivers = {}
  
! def get_driver(type, backend=None):
      """Return a rendering driver
  
      Parameters:
!         type: "Text" or "Image"
          backend: optional name of preferred backend,
              like "PIL" or "wx".  If omitted or None,
--- 32,40 ----
  _text_drivers = {}
  
! def get_driver(driver_type, backend=None):
      """Return a rendering driver
  
      Parameters:
!         driver_type: "Text" or "Image"
          backend: optional name of preferred backend,
              like "PIL" or "wx".  If omitted or None,
***************
*** 42,55 ****
  
      """
!     if type == "Text":
          _drivers = _text_drivers
!     elif type == "Image":
          _drivers = _image_drivers
      else:
!         raise ValueError("Invalid driver type: %r" % type)
      # if this is the first call for selected driver type,
      # load all available drivers
      if not _drivers:
!         if type == "Image":
              # Use ImageDriver class from this module as dummy fallback driver
              # (will be overwritten as soon as any actual driver is found).
--- 42,55 ----
  
      """
!     if driver_type == "Text":
          _drivers = _text_drivers
!     elif driver_type == "Image":
          _drivers = _image_drivers
      else:
!         raise ValueError("Invalid driver type: %r" % driver_type)
      # if this is the first call for selected driver type,
      # load all available drivers
      if not _drivers:
!         if driver_type == "Image":
              # Use ImageDriver class from this module as dummy fallback driver
              # (will be overwritten as soon as any actual driver is found).
***************
*** 71,76 ****
              _vars = {}
              try:
                  exec("from PythonReports.%sDrivers import %sDriver as Driver"
!                     % (_backend, type), _vars)
              except ImportError:
                  continue
--- 71,78 ----
              _vars = {}
              try:
+                 # pylint: disable-msg=W0122
+                 # W0122: Use of the exec statement
                  exec("from PythonReports.%sDrivers import %sDriver as Driver"
!                     % (_backend, driver_type), _vars)
              except ImportError:
                  continue
***************
*** 79,83 ****
                  _drivers[_backend] = _driver
          if _driver is None:
!             raise RuntimeError("No %s driver found" % type)
          # last loaded driver is used by default
          _drivers[None] = _driver
--- 81,85 ----
                  _drivers[_backend] = _driver
          if _driver is None:
!             raise RuntimeError("No %s driver found" % driver_type)
          # last loaded driver is used by default
          _drivers[None] = _driver
***************
*** 105,109 ****
      filepath = None # set when loaded from disk file
      name = None     # name of data block
!     type = None     # image type, e.g. "jpeg" or "png"
      use_count = 0   # number of references to this source, set/read by builder
  
--- 107,111 ----
      filepath = None # set when loaded from disk file
      name = None     # name of data block
!     img_type = None # image type, e.g. "jpeg" or "png"
      use_count = 0   # number of references to this source, set/read by builder
  
***************
*** 116,120 ****
  
          """
!         if self.type.lower() in ("jpeg", "jpg"):
              return "jpeg"
          else:
--- 118,122 ----
  
          """
!         if self.img_type.lower() in ("jpeg", "jpg"):
              return "jpeg"
          else:
***************
*** 122,131 ****
  
      @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"
  
          Return value: new image wrapper object.
--- 124,133 ----
  
      @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"
  
          Return value: new image wrapper object.
***************
*** 135,144 ****
  
      @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"
              name: optional name of a report block containing data
  
--- 137,146 ----
  
      @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"
              name: optional name of a report block containing data
  
***************
*** 161,169 ****
          raise NotImplementedError
  
!     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).
  
--- 163,171 ----
          raise NotImplementedError
  
!     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).
  
***************
*** 173,177 ****
          raise NotImplementedError
  
!     def scale(self, width, height, type=None):
          """Return a scaled image
  
--- 175,179 ----
          raise NotImplementedError
  
!     def scale(self, width, height, img_type=None):
          """Return a scaled image
  
***************
*** 179,183 ****
              width: target image width
              height: target image height
!             type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
--- 181,185 ----
              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).
  
***************
*** 187,191 ****
          raise NotImplementedError
  
!     def _cut(self, width, height, type):
          """Return an image cut to dimensions
  
--- 189,193 ----
          raise NotImplementedError
  
!     def _cut(self, width, height, img_type):
          """Return an image cut to dimensions
  
***************
*** 193,197 ****
              width: target image width
              height: target image height
!             type: image type, e.g. "jpeg" or "gif"
  
          Return value: image data as string.
--- 195,199 ----
              width: target image width
              height: target image height
!             img_type: image type, e.g. "jpeg" or "gif"
  
          Return value: image data as string.
***************
*** 205,209 ****
          raise NotImplementedError
  
!     def cut(self, width, height, type=None):
          """Return an image cut to dimensions
  
--- 207,211 ----
          raise NotImplementedError
  
!     def cut(self, width, height, img_type=None):
          """Return an image cut to dimensions
  
***************
*** 211,215 ****
              width: target image width
              height: target image height
!             type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
--- 213,217 ----
              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).
  
***************
*** 224,233 ****
  
          """
!         if not type:
!             type = self.preferred_type
!         (_my_width, _my_height) = self._image.size
!         return self._cut(min(width, _my_width), min(height, _my_height), type)
  
!     def resize(self, width, height, scale=False, type=None):
          """Return resized image
  
--- 226,238 ----
  
          """
!         if not img_type:
!             # pylint: disable-msg=C0103
!             # C0103: Invalid name "img_type"
!             img_type = self.preferred_type
!         (_my_width, _my_height) = self.getsize()
!         return self._cut(min(width, _my_width), min(height, _my_height),
!             img_type)
  
!     def resize(self, width, height, scale=False, img_type=None):
          """Return resized image
  
***************
*** 237,241 ****
              scale: if False (default), the image is cut to given size.
                  If True, the image is scaled to the size.
!             type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
--- 242,246 ----
              scale: if False (default), the image is cut to given size.
                  If True, the image is scaled to the size.
!             img_type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
***************
*** 244,249 ****
  
          """
!         if not type:
!             type = self.preferred_type
          (_my_width, _my_height) = self.getsize()
          if (width == _my_width) and (height == _my_height):
--- 249,256 ----
  
          """
!         if not img_type:
!             # pylint: disable-msg=C0103
!             # C0103: Invalid name "img_type"
!             img_type = self.preferred_type
          (_my_width, _my_height) = self.getsize()
          if (width == _my_width) and (height == _my_height):
***************
*** 252,258 ****
          elif scale:
              # may adjust to any size
!             _rv = self.scale(width, height, type=type)
!         elif (width > _my_width) or (heigth > _my_height):
!             _rv = self.cut(width, height, type=type)
          else:
              # should cut, but the image is smaller than cut frame
--- 259,265 ----
          elif scale:
              # may adjust to any size
!             _rv = self.scale(width, height, img_type=img_type)
!         elif (width > _my_width) or (height > _my_height):
!             _rv = self.cut(width, height, img_type=img_type)
          else:
              # should cut, but the image is smaller than cut frame
***************
*** 281,284 ****
--- 288,293 ----
  
          """
+         # pylint: disable-msg=W0613
+         # W0613: Unused argument 'font'
          super(TextDriver, self).__init__()
  
***************
*** 351,360 ****
          Return value: 2-element tuple (width, height).
          Returned width is less than or equal to passed width.
!         Returned height may by less than or greater than passed height.
  
          """
          if width > 0:
!             text = self.wrap(text, width)
!         return self.getsize(text)
  
  # vim: set et sts=4 sw=4 :
--- 360,372 ----
          Return value: 2-element tuple (width, height).
          Returned width is less than or equal to passed width.
!         Returned height may be less than or greater than passed height.
  
          """
+         # pylint: disable-msg=W0613
+         # W0613: Unused argument 'height'
          if width > 0:
!             return self.getsize(self.wrap(text, width))
!         else:
!             return self.getsize(text)
  
  # vim: set et sts=4 sw=4 :