pythonreports-checkins

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

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

Modified Files:
	Tk.py 
Log Message:
fix errors and some warnings reported by pylint

Index: Tk.py
===================================================================
RCS file: /cvsroot/pythonreports/PythonReports/PythonReports/Tk.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Tk.py	7 Nov 2006 13:32:02 -0000	1.2
--- Tk.py	6 Dec 2006 17:02:22 -0000	1.3
***************
*** 1,6 ****
  #! /usr/bin/env python
  """Tk output for PythonReports"""
- 
  """History (most recent first):
  07-Nov-2006 [phd]   Added shebang.
  20-oct-2006 [als]   Barcode X dimension attr renamed to "module"
--- 1,6 ----
  #! /usr/bin/env python
  """Tk output for PythonReports"""
  """History (most recent first):
+ 05-dec-2006 [als]   fix errors and some warnings reported by pylint
  07-Nov-2006 [phd]   Added shebang.
  20-oct-2006 [als]   Barcode X dimension attr renamed to "module"
***************
*** 39,53 ****
  
          """
-         if isinstance(report, basestring):
-             report = prp.load(report)
          super(Painter, self).__init__()
!         self.report = report
!         self.pages = report.findall("page")
          # element handlers
          self.handlers = {
!             "line": self.DrawLine,
!             "rectangle": self.DrawRectangle,
!             "text": self.DrawText,
!             "barcode": self.DrawBarcode,
          }
          try:
--- 39,54 ----
  
          """
          super(Painter, self).__init__()
!         if isinstance(report, basestring):
!             self.report = prp.load(report)
!         else:
!             self.report = report
!         self.pages = self.report.findall("page")
          # element handlers
          self.handlers = {
!             "line": self.drawLine,
!             "rectangle": self.drawRectangle,
!             "text": self.drawText,
!             "barcode": self.drawBarcode,
          }
          try:
***************
*** 58,65 ****
          else:
              # can process images
!             self.handlers["image"] = self.DrawImage
              self.named_images = {}
          _fonts = {}
!         for (_name, _font) in report.fonts.iteritems():
              _modifiers = []
              if _font.get("bold"):
--- 59,66 ----
          else:
              # can process images
!             self.handlers["image"] = self.drawImage
              self.named_images = {}
          _fonts = {}
!         for (_name, _font) in self.report.fonts.iteritems():
              _modifiers = []
              if _font.get("bold"):
***************
*** 108,115 ****
          if scale < .1:
              # zoom to less than 10% is disallowed
!             scale = .1
!         self.scale = scale
          self.scaled_fonts = dict([
!             (_name, (_face, max(1, int(round(_size * scale))), _options))
              for (_name, (_face, _size, _options)) in self.fonts.iteritems()])
          # draw elements
--- 109,117 ----
          if scale < .1:
              # zoom to less than 10% is disallowed
!             self.scale = .1
!         else:
!             self.scale = scale
          self.scaled_fonts = dict([
!             (_name, (_face, max(1, int(round(_size * self.scale))), _options))
              for (_name, (_face, _size, _options)) in self.fonts.iteritems()])
          # draw elements
***************
*** 163,167 ****
              for _dim in (_box.left, _box.top, _box.right, _box.bottom))
  
!     def DrawLine(self, canvas, line):
          (_x0, _y0, _x1, _y1) = self.getDimensions(line)
          if not line.get("backslant"):
--- 165,170 ----
              for _dim in (_box.left, _box.top, _box.right, _box.bottom))
  
!     def drawLine(self, canvas, line):
!         """Draw a line"""
          (_x0, _y0, _x1, _y1) = self.getDimensions(line)
          if not line.get("backslant"):
***************
*** 170,174 ****
              **self._lineattrs(line.get("pen")))
  
!     def DrawRectangle(self, canvas, rect):
          _options = {"outline": str(rect.get("pencolor"))}
          _options.update(self._lineattrs(rect.get("pen")))
--- 173,178 ----
              **self._lineattrs(line.get("pen")))
  
!     def drawRectangle(self, canvas, rect):
!         """Draw a rectangle"""
          _options = {"outline": str(rect.get("pencolor"))}
          _options.update(self._lineattrs(rect.get("pen")))
***************
*** 178,185 ****
          canvas.create_rectangle(*self.getDimensions(rect), **_options)
  
!     def _get_named_image(self, name, type):
          """Return an image loaded from a named data element"""
          try:
!             return self.named_images[(name, type)]
          except KeyError:
              pass
--- 182,194 ----
          canvas.create_rectangle(*self.getDimensions(rect), **_options)
  
!     def _get_named_image(self, name, img_type):
          """Return an image loaded from a named data element"""
+         # pylint: disable-msg=W0631,W0704
+         # W0631: Using possibly undefined loop variable '_element' -
+         #   if the loop didn't run, raise error before the variable is used
+         # W0704: Except doesn't do anything - if the image was
+         #   not loaded yet, it will be handled after try/except block.
          try:
!             return self.named_images[(name, img_type)]
          except KeyError:
              pass
***************
*** 189,197 ****
          else:
              raise KeyError("data element with name=%r cannot be found" % name)
!         _img = self.image_driver.fromdata(Data.get_data(_element), type)
!         self.named_images[(name, type)] = _img
          return _img
  
!     def DrawImage(self, canvas, image):
          _type = image.get("type")
          _img = image.get("file")
--- 198,207 ----
          else:
              raise KeyError("data element with name=%r cannot be found" % name)
!         _img = self.image_driver.fromdata(Data.get_data(_element), img_type)
!         self.named_images[(name, img_type)] = _img
          return _img
  
!     def drawImage(self, canvas, image):
!         """Draw an image"""
          _type = image.get("type")
          _img = image.get("file")
***************
*** 211,215 ****
              dimension(_box.get("height") * self.scale))
          # data for PhotoImage must be base64-encoded gif
!         _data = _img.resize(_width, _height, image.get("scale"), type="gif")
          _img = PhotoImage(data=base64.b64encode(_data))
          canvas.printout_images.append(_img)
--- 221,226 ----
              dimension(_box.get("height") * self.scale))
          # data for PhotoImage must be base64-encoded gif
!         _data = _img.resize(_width, _height, image.get("scale"),
!             img_type="gif")
          _img = PhotoImage(data=base64.b64encode(_data))
          canvas.printout_images.append(_img)
***************
*** 217,221 ****
              *self.getDimensions(image)[:2])
  
!     def DrawText(self, canvas, text):
          _content = text.find("data").text
          if not _content:
--- 228,233 ----
              *self.getDimensions(image)[:2])
  
!     def drawText(self, canvas, text):
!         """Draw a text block"""
          _content = text.find("data").text
          if not _content:
***************
*** 227,230 ****
--- 239,245 ----
          }
          if "\n" in _content:
+             # pylint: disable-msg=W0704
+             # W0704: Except doesn't do anything - if justify code is unknown,
+             #   we just ignore it (resulting in left-justified text).
              # can use Tk text justify
              try:
***************
*** 252,256 ****
              canvas.create_text(dimension(_x), dimension(_box.top), **_options)
  
!     def DrawBarcode(self, canvas, barcode):
          _xdim = barcode.get("module") / 1000. * 72.
          _stripes = [int(_stripe) * _xdim * self.scale
--- 267,272 ----
              canvas.create_text(dimension(_x), dimension(_box.top), **_options)
  
!     def drawBarcode(self, canvas, barcode):
!         """Draw Bar Code symbol"""
          _xdim = barcode.get("module") / 1000. * 72.
          _stripes = [int(_stripe) * _xdim * self.scale
***************
*** 282,285 ****
--- 298,303 ----
  
      """Printout display widget"""
+     # pylint: disable-msg=R0904
+     # R0904: Too many public methods - from base class
  
      PAGE_PADDING = 10 # padding around the page on the preview canvas
***************
*** 299,304 ****
          Frame.__init__(self, master, class_="PythonReportsWidget", **options)
          if isinstance(report, basestring):
!             report = prp.load(report)
!         self.painter = Painter(report)
          self.pageno = 1
          self.pagevar = StringVar()
--- 317,324 ----
          Frame.__init__(self, master, class_="PythonReportsWidget", **options)
          if isinstance(report, basestring):
!             self.report = prp.load(report)
!         else:
!             self.report = report
!         self.painter = Painter(self.report)
          self.pageno = 1
          self.pagevar = StringVar()
***************
*** 386,397 ****
          # make sure pageno is in range
          _pagecount = self.painter.pagecount()
!         if pageno < 0:
!             pageno += _pagecount
!         if pageno > _pagecount:
!             pageno = _pagecount
!         elif pageno < 1:
!             pageno = 1
          # enable/disable navigation buttons
!         if pageno == 1:
              self.button_first["state"] = DISABLED
              self.button_prev["state"] = DISABLED
--- 406,418 ----
          # make sure pageno is in range
          _pagecount = self.painter.pagecount()
!         _pageno = pageno # don't update argument to make pylint happy
!         if _pageno < 0:
!             _pageno += _pagecount
!         if _pageno > _pagecount:
!             _pageno = _pagecount
!         elif _pageno < 1:
!             _pageno = 1
          # enable/disable navigation buttons
!         if _pageno == 1:
              self.button_first["state"] = DISABLED
              self.button_prev["state"] = DISABLED
***************
*** 400,404 ****
              self.button_first["state"] = NORMAL
              self.button_prev["state"] = NORMAL
!         if pageno == _pagecount:
              self.button_next["state"] = DISABLED
              self.button_last["state"] = DISABLED
--- 421,425 ----
              self.button_first["state"] = NORMAL
              self.button_prev["state"] = NORMAL
!         if _pageno == _pagecount:
              self.button_next["state"] = DISABLED
              self.button_last["state"] = DISABLED
***************
*** 410,414 ****
          _canvas.delete("ALL")
          # update canvas dimensions
!         (_width, _height) = self.painter.pagesize(pageno - 1)
          _width *= self.scale
          _height *= self.scale
--- 431,435 ----
          _canvas.delete("ALL")
          # update canvas dimensions
!         (_width, _height) = self.painter.pagesize(_pageno - 1)
          _width *= self.scale
          _height *= self.scale
***************
*** 419,441 ****
          _canvas.create_rectangle(0, 0, dimension(_width), dimension(_height),
              fill="white", width="1p")
!         self.painter.paint(_canvas, pageno - 1, self.scale)
          _canvas.addtag_all("ALL")
          # update state
!         self.pageno = pageno
!         self.pagevar.set(str(pageno))
  
      def OnButtonFirst(self):
          self.ShowPage(1)
  
      def OnButtonPrev(self):
          self.ShowPage(self.pageno - 1)
  
      def OnButtonNext(self):
          self.ShowPage(self.pageno + 1)
  
      def OnButtonLast(self):
          self.ShowPage(self.painter.pagecount())
  
      def OnPageNumber(self, event):
          _value = self.pagevar.get()
          event.widget.select_range(0, len(_value))
--- 440,467 ----
          _canvas.create_rectangle(0, 0, dimension(_width), dimension(_height),
              fill="white", width="1p")
!         self.painter.paint(_canvas, _pageno - 1, self.scale)
          _canvas.addtag_all("ALL")
          # update state
!         self.pageno = _pageno
!         self.pagevar.set(str(_pageno))
  
      def OnButtonFirst(self):
+         """Go to the first page"""
          self.ShowPage(1)
  
      def OnButtonPrev(self):
+         """Go to previous page"""
          self.ShowPage(self.pageno - 1)
  
      def OnButtonNext(self):
+         """Go to next page"""
          self.ShowPage(self.pageno + 1)
  
      def OnButtonLast(self):
+         """Go to the last page"""
          self.ShowPage(self.painter.pagecount())
  
      def OnPageNumber(self, event):
+         """Go to the specified page number"""
          _value = self.pagevar.get()
          event.widget.select_range(0, len(_value))
***************
*** 443,453 ****
--- 469,482 ----
  
      def OnBeginDrag(self, event):
+         """Start dragging the image"""
          self.canvas["cursor"] = "fleur"
          self.canvas.scan_mark(event.x, event.y)
  
      def OnDrag(self, event):
+         """Drag the preview image"""
          self.canvas.scan_dragto(event.x, event.y)
  
      def OnEndDrag(self, event):
+         """End preview dragging"""
          self.canvas["cursor"] = ""
  
***************
*** 458,466 ****
  
          """
          _val = self.zoomvar.get().replace("%", "")
          try:
              return int(_val)
          except:
!             return self.zoom
  
      def OnZoomSpin(self, direction):
--- 487,498 ----
  
          """
+         # pylint: disable-msg=W0702
+         # W0702: No exception's type specified
+         #   i wonder what type of exception can occur here?
          _val = self.zoomvar.get().replace("%", "")
          try:
              return int(_val)
          except:
!             return int(self.scale * 100)
  
      def OnZoomSpin(self, direction):
***************
*** 474,477 ****
--- 506,510 ----
  
      def OnZoomEntry(self, event):
+         """Zoom to entered value"""
          self.Zoom(self._get_zoom_value())
  
***************
*** 484,487 ****
--- 517,522 ----
          """
          if percentage < 10:
+             # pylint: disable-msg=C0103
+             # C0103: Invalid name "percentage"
              percentage = 10
          self.scale = percentage / 100.
***************
*** 492,495 ****
--- 527,532 ----
  
      """Toplevel window displaying a printout"""
+     # pylint: disable-msg=R0904
+     # R0904: Too many public methods - from base class
  
      def __init__(self, report, title=None, **options):
***************
*** 503,510 ****
--- 540,551 ----
          """
          if isinstance(report, basestring):
+             # pylint: disable-msg=C0103
+             # C0103: Invalid names "report", "title"
              if title is None:
                  title = report
              report = prp.load(report)
          elif title is None:
+             # pylint: disable-msg=C0103
+             # C0103: Invalid name "title"
              title = "Report Printout"
          Toplevel.__init__(self, class_="PythonReportsWindow", **options)
***************
*** 514,517 ****
--- 555,559 ----
  
  def run(argv=sys.argv):
+     """Command line executable"""
      if len(argv) != 2:
          print "Usage: %s <printout>" % argv[0]