Other cleanup

smartcard/pyro/server/PyroDaemon.py

@@ -85,8 +85,8 @@ def __init__(self):
  Thread.__init__(self)
  self.setDaemon(True)
  self.setName('smartcard.pyro.server.PyroDaemonThread')
- self.daemon = PyroDaemon()
+ self._daemon = PyroDaemon()
 
  def run(self):
  """Starts Pyro daemon."""
- self.daemon.start()
+ self._daemon.start()

smartcard/util/__init__.py

@@ -99,7 +99,7 @@ def toBytes(bytestring):
  """
  from struct import unpack
  import re
- packedstring = ''.join(re.split('\W+', bytestring))
+ packedstring = ''.join(re.split(r'\W+', bytestring))
  try:
  return reduce(lambda x, y: x + [int(y, 16)],
  unpack('2s' * (len(packedstring) / 2),
@@ -204,9 +204,6 @@ def toHexString(bytes=[], format=0):
 
  from string import rstrip
 
- for byte in tuple(bytes):
- pass
-
  if type(bytes) is not list:
  raise TypeError('not a list of bytes')
 

smartcard/wx/APDUHexValidator.py

@@ -48,7 +48,7 @@ def Clone(self):
 
  def Validate(self, win):
  tc = self.GetWindow()
- val = tc.GetValue()
+ value = tc.GetValue()
 
  if not apduregexp.match(value):
  return False

smartcard/wx/CardAndReaderTreePanel.py

@@ -408,9 +408,9 @@ def __init__(self, parent, appstyle, clientpanel):
  def OnDestroy(self, event):
  """Called on panel destruction."""
  # deregister observers
- if hasattr(self, cardmonitor):
+ if hasattr(self, 'cardmonitor'):
  self.cardmonitor.deleteObserver(self.cardtreecardobserver)
- if hasattr(self, readermonitor):
+ if hasattr(self, 'readermonitor'):
  self.readermonitor.deleteObserver(self.readertreereaderobserver)
  self.cardmonitor.deleteObserver(self.readertreecardobserver)
  event.Skip()

smartcard/wx/ReaderToolbar.py

@@ -77,12 +77,12 @@ def __init__(self, parent):
  bmpReader = wx.Bitmap(ICO_READER, wx.BITMAP_TYPE_ICO)
  else:
  bmpReader = wx.ArtProvider_GetBitmap(
- wx.ART_HELP_BOOK, wx.ART_OTHER, isz)
+ wx.ART_HELP_BOOK, wx.ART_OTHER, tsize)
  if None != ICO_SMARTCARD:
  bmpCard = wx.Bitmap(ICO_SMARTCARD, wx.BITMAP_TYPE_ICO)
  else:
  bmpCard = wx.ArtProvider_GetBitmap(
- wx.ART_HELP_BOOK, wx.ART_OTHER, isz)
+ wx.ART_HELP_BOOK, wx.ART_OTHER, tsize)
  self.readercombobox = ReaderComboBox(self)
 
  # create and add controls