pythonreports-checkins

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

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

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

Index: wxDrivers.py
===================================================================
RCS file: /cvsroot/pythonreports/PythonReports/PythonReports/wxDrivers.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxDrivers.py	1 Nov 2006 17:44:32 -0000	1.1
--- wxDrivers.py	6 Dec 2006 17:05:46 -0000	1.2
***************
*** 1,8 ****
  """Rendering utilities for wxPython backend"""
- 
  """History (most recent first):
  01-nov-2006 [als]   created
  """
- 
  __version__ = "$Revision$"[11:-2]
  __date__ = "$Date$"[7:-2]
--- 1,7 ----
  """Rendering utilities for wxPython backend"""
  """History (most recent first):
+ 05-dec-2006 [als]   sweep pylint warnings
  01-nov-2006 [als]   created
  """
  __version__ = "$Revision$"[11:-2]
  __date__ = "$Date$"[7:-2]
***************
*** 53,70 ****
  
      @classmethod
!     def _get_type_flag(cls, type):
          """Return wxImage construction flag for given image type"""
          try:
!             return cls.TYPE_FLAGS[type]
          except KeyError:
!             raise ValueError("Unsupported image type: %r" % type)
  
      @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.
--- 52,69 ----
  
      @classmethod
!     def _get_type_flag(cls, img_type):
          """Return wxImage construction flag for given image type"""
          try:
!             return cls.TYPE_FLAGS[img_type]
          except KeyError:
!             raise ValueError("Unsupported image type: %r" % img_type)
  
      @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.
***************
*** 73,87 ****
          _rv = cls()
          _rv.filepath = filepath
!         _rv.type = type
!         _rv._image = wx.Image(filepath, cls._get_type_flag(type))
          return _rv
  
      @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
  
--- 72,86 ----
          _rv = cls()
          _rv.filepath = filepath
!         _rv.img_type = img_type
!         _rv._image = wx.Image(filepath, cls._get_type_flag(img_type))
          return _rv
  
      @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
  
***************
*** 91,99 ****
          _rv = cls()
          _rv.name = name
!         _rv.type = type
          #_rv._image = wx.ImageFromStream(wx.InputStream(StringIO(data)),
!         #    cls._get_type_flag(type))
          _rv._image = wx.ImageFromStream(StringIO(data),
!             cls._get_type_flag(type))
          return _rv
  
--- 90,98 ----
          _rv = cls()
          _rv.name = name
!         _rv.img_type = img_type
          #_rv._image = wx.ImageFromStream(wx.InputStream(StringIO(data)),
!         #    cls._get_type_flag(img_type))
          _rv._image = wx.ImageFromStream(StringIO(data),
!             cls._get_type_flag(img_type))
          return _rv
  
***************
*** 106,115 ****
          return (self._image.GetWidth(), self._image.GetHeight())
  
!     def _get_image_data(self, image, type=None):
          """Return image data as string
  
          Parameters:
              image: wx.Image object
!             type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
--- 105,114 ----
          return (self._image.GetWidth(), self._image.GetHeight())
  
!     def _get_image_data(self, image, img_type=None):
          """Return image data as string
  
          Parameters:
              image: wx.Image object
!             img_type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
***************
*** 117,125 ****
  
          """
!         if not type:
!             type = self.preferred_type
          # XXX shoud use a MemoryFileSystem to avoid creating a temporary file.
          _filename = os.tempnam(None, "primg")
!         image.SaveFile(_filename, self._get_type_flag(type))
          _file = open(_filename, "rb")
          _rv = _file.read()
--- 116,126 ----
  
          """
!         if not img_type:
!             # pylint: disable-msg=C0103
!             # C0103: Invalid name "img_type"
!             img_type = self.preferred_type
          # XXX shoud use a MemoryFileSystem to avoid creating a temporary file.
          _filename = os.tempnam(None, "primg")
!         image.SaveFile(_filename, self._get_type_flag(img_type))
          _file = open(_filename, "rb")
          _rv = _file.read()
***************
*** 128,136 ****
          return _rv
  
!     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).
  
--- 129,137 ----
          return _rv
  
!     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).
  
***************
*** 138,144 ****
  
          """
!         return self._get_image_data(self._image, type)
  
!     def scale(self, width, height, type=None):
          """Return a scaled image
  
--- 139,145 ----
  
          """
!         return self._get_image_data(self._image, img_type)
  
!     def scale(self, width, height, img_type=None):
          """Return a scaled image
  
***************
*** 146,150 ****
              width: target image width
              height: target image height
!             type: optional image type, e.g. "jpeg" or "gif".
                  Default: preferred output type (jpeg or png).
  
--- 147,151 ----
              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).
  
***************
*** 152,158 ****
  
          """
!         return self._get_image_data(self._image.Scale(width, height), type)
  
!     def _cut(self, width, height, type):
          """Return an image cut to dimensions
  
--- 153,159 ----
  
          """
!         return self._get_image_data(self._image.Scale(width, height), img_type)
  
!     def _cut(self, width, height, img_type):
          """Return an image cut to dimensions
  
***************
*** 160,164 ****
              width: target image width
              height: target image height
!             type: image type, e.g. "jpeg" or "gif"
  
          Return value: image data as string.
--- 161,165 ----
              width: target image width
              height: target image height
!             img_type: image type, e.g. "jpeg" or "gif"
  
          Return value: image data as string.
***************
*** 171,175 ****
          """
          _img = self._image.Size((width, height), (0, 0))
!         return self._get_image_data(_img, type)
  
  class TextDriver(drivers.TextDriver):
--- 172,176 ----
          """
          _img = self._image.Size((width, height), (0, 0))
!         return self._get_image_data(_img, img_type)
  
  class TextDriver(drivers.TextDriver):