Merge pull request #6 from moreati/import-cleanups

Fix import errors and warnings detected by pylint

smartcard/Card.py

@@ -21,7 +21,6 @@
 along with pyscard; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
-from smartcard.Exceptions import CardConnectionException, NoCardException
 from smartcard.reader.Reader import Reader
 from smartcard.System import readers
 from smartcard.util import toHexString

smartcard/CardConnection.py

@@ -24,8 +24,6 @@
 """
 
 from smartcard.CardConnectionEvent import CardConnectionEvent
-from smartcard.Exceptions import SmartcardException
-from smartcard.Observer import Observer
 from smartcard.Observer import Observable
 
 

smartcard/CardMonitoring.py

@@ -33,12 +33,9 @@
 from time import sleep
 import traceback
 
-from smartcard.System import readers
-from smartcard.Exceptions import CardRequestTimeoutException
 from smartcard.Observer import Observer
 from smartcard.Observer import Observable
 
-from smartcard.CardType import AnyCardType
 from smartcard.CardRequest import CardRequest
 
 _START_ON_DEMAND_ = False
@@ -219,7 +216,6 @@ def __getattr__(self, name):
 
 
 if __name__ == "__main__":
- from smartcard.CardMonitoring import CardMonitor
  print('insert or remove cards in the next 10 seconds')
 
  # a simple card observer that prints added/removed cards

smartcard/CardService.py

@@ -31,7 +31,6 @@
 """
 
 from __future__ import print_function
-from smartcard.Exceptions import SmartcardException
 from smartcard.scard import *
 
 

smartcard/CardType.py

@@ -22,6 +22,7 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 from __future__ import print_function
+from smartcard.Exceptions import InvalidATRMaskLengthException
 from smartcard.System import readers
 from smartcard.util import toHexString
 

smartcard/ClassLoader.py

@@ -9,10 +9,6 @@
 License: PSF license (http:https://docs.python.org/license.html).
 """
 
-import sys
-import types
-
-
 def get_mod(modulePath):
  """Import a module."""
  return __import__(modulePath, globals(), locals(), [''])

smartcard/Examples/wx/pcscdiag/pcscdiag.py

@@ -35,7 +35,7 @@
 # wxPython GUI modules (http:https://www.wxpython.org)
 try:
  import wx
-except:
+except ImportError:
  print('You need wxpython (http:https://www.wxpython.org) ' + \
  'to run this sample from the source code!')
  print('press a key to continue')

smartcard/ExclusiveConnectCardConnection.py

@@ -22,7 +22,6 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 from __future__ import print_function
-from smartcard.CardConnection import CardConnection
 from smartcard.CardConnectionDecorator import CardConnectionDecorator
 from smartcard.Exceptions import CardConnectionException
 from smartcard.scard import SCardConnect, SCardDisconnect

smartcard/ExclusiveTransmitCardConnection.py

@@ -22,13 +22,11 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 from __future__ import print_function
-from smartcard.CardConnection import CardConnection
 from smartcard.CardConnectionDecorator import CardConnectionDecorator
 from smartcard.Exceptions import CardConnectionException
 from smartcard.scard import SCardBeginTransaction, SCardEndTransaction
 from smartcard.scard import SCARD_LEAVE_CARD
 from smartcard.scard import SCardGetErrorMessage
-from smartcard.pcsc import PCSCCardConnection
 import smartcard.pcsc
 
 

smartcard/PassThruCardService.py

@@ -54,7 +54,6 @@ def supports(cardname):
  SELECT = [0xA0, 0xA4, 0x00, 0x00, 0x02]
  DF_TELECOM = [0x7F, 0x10]
  from smartcard.System import readers
- from smartcard.CardConnection import CardConnection
  cc = readers()[0].createConnection()
  cs = PassThruCardService(cc)
  cs.connection.connect()

smartcard/ReaderMonitoring.py

@@ -29,12 +29,11 @@
 """
 
 from __future__ import print_function
-from threading import Thread, Event, enumerate
+from threading import Thread, Event
 from time import sleep
 import traceback
 
 import smartcard.System
-from smartcard.Exceptions import ListReadersException
 from smartcard.Observer import Observer
 from smartcard.Observer import Observable
 from smartcard.Synchronization import *
@@ -204,7 +203,6 @@ def stop(self):
  self.join()
 
 if __name__ == "__main__":
- from smartcard.ReaderMonitoring import ReaderMonitor
  print('insert or remove readers in the next 20 seconds')
 
  # a simple reader observer that prints added/removed readers

smartcard/Session.py

@@ -25,7 +25,6 @@
 
 from __future__ import print_function
 from smartcard.Exceptions import InvalidReaderException, NoReadersException
-from smartcard.CardConnection import CardConnection
 from smartcard.PassThruCardService import PassThruCardService
 from smartcard.System import readers
 

smartcard/pcsc/PCSCCardConnection.py

@@ -26,7 +26,6 @@
 from smartcard.CardConnection import CardConnection
 from smartcard.Exceptions import (CardConnectionException,
  NoCardException, SmartcardException)
-from smartcard.Observer import Observable
 
 from smartcard.scard import *
 

smartcard/pyro/PyroReader.py

@@ -26,9 +26,8 @@
 import Pyro.core
 import Pyro.naming
 
-from smartcard.Exceptions import CardConnectionException, NoCardException
+from smartcard.Exceptions import NoCardException
 from smartcard.reader.Reader import Reader
-from smartcard.reader.ReaderFactory import ReaderFactory
 
 
 class PyroReader(Reader):

smartcard/pyro/server/PyroEventServer.py

@@ -93,7 +93,6 @@ def __call__(self, signame, sf):
 
 
 if __name__ == '__main__':
- import sys
  from smartcard.pyro.server.PyroNameServer import PyroNameServer
  pn = PyroNameServer(sys.argv[1:])
  pn.start()

smartcard/pyro/server/RemoteCardConnection.py

@@ -26,10 +26,7 @@
 import Pyro.core
 import Pyro.naming
 
-from smartcard.CardConnection import CardConnection
 from smartcard.CardConnectionDecorator import CardConnectionDecorator
-from smartcard.Exceptions import CardConnectionException, NoCardException
-from smartcard.Observer import Observable
 
 
 class RemoteCardConnection(CardConnectionDecorator, Pyro.core.ObjBase):

smartcard/pyro/server/RemoteReaderServer.py

@@ -28,16 +28,12 @@
 try:
  import Pyro.core
  import Pyro.naming
-except:
+except ImportError:
  print('You need pyro (python remote objects) ' + \
  'at http:https://www.xs4all.nl/~irmen/pyro3/')
  import sys
  sys.exit()
 
-import signal
-import time
-
-import smartcard.System
 from smartcard.reader.Reader import Reader
 from smartcard.ReaderMonitoring import ReaderMonitor, ReaderObserver
 from smartcard.pyro.server.RemoteCardConnection import RemoteCardConnection

smartcard/wx/SimpleSCardAppFrame.py

@@ -26,10 +26,11 @@
 
 import os.path
 import wx
+
 import smartcard.wx
-import APDUTracerPanel
-import CardAndReaderTreePanel
-import ReaderToolbar
+from smartcard.wx import APDUTracerPanel
+from smartcard.wx import CardAndReaderTreePanel
+from smartcard.wx import ReaderToolbar
 
 import smartcard
 from smartcard.wx.SimpleSCardAppEventObserver import \