Remove all but two uses of 'except:' & 'except Exception:'

The remaining instance will now print a full traceback. This should
improve on with https://sourceforge.net/p/pyscard/bugs/8/, or at least
make it easier to solve

smartcard/CardMonitoring.py

@@ -28,9 +28,9 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
-from sys import exc_info
 from threading import Thread, Event
 from time import sleep
+import traceback
 
 from smartcard.System import readers
 from smartcard.Exceptions import CardRequestTimeoutException
@@ -186,15 +186,9 @@ def run(self):
  pass
  except AttributeError:
  pass
-
  except:
- try:
- import sys
- print sys.exc_info()[1]
- print sys.exc_info()[2]
- print sys.exc_info()[0]
- except:
- pass
+ # FIXME Tighten the exceptions caught by this block
+ traceback.print_exc()
 
  # stop the thread by signaling stopEvent
  def stop(self):

smartcard/Examples/framework/sample_MonitorCards.py

@@ -24,7 +24,7 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
-from sys import stdin, exc_info
+import sys
 from time import sleep
 
 from smartcard.CardMonitoring import CardMonitor, CardObserver
@@ -44,7 +44,7 @@ def update(self, observable, (addedcards, removedcards)):
  for card in removedcards:
  print "-Removed: ", toHexString(card.atr)
 
-try:
+if __name__ == '__main__':
  print "Insert or remove a smartcard in the system."
  print "This program will exit in 10 seconds"
  print ""
@@ -58,10 +58,6 @@ def update(self, observable, (addedcards, removedcards)):
  # monitor will poll forever...
  cardmonitor.deleteObserver(cardobserver)
 
- import sys
  if 'win32' == sys.platform:
  print 'press Enter to continue'
  sys.stdin.read(1)
-
-except:
- print exc_info()[0], ':', exc_info()[1]

smartcard/Examples/framework/sample_MonitorCardsAndTransmit.py

@@ -25,7 +25,7 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
-from sys import stdin, exc_info
+import sys
 from time import sleep
 
 from smartcard.CardConnectionObserver import ConsoleCardConnectionObserver
@@ -63,7 +63,7 @@ def update(self, observable, (addedcards, removedcards)):
  for card in removedcards:
  print "-Removed: ", toHexString(card.atr)
 
-try:
+if __name__ == '__main__':
  print "Insert or remove a SIM card in the system."
  print "This program will exit in 60 seconds"
  print ""
@@ -77,10 +77,6 @@ def update(self, observable, (addedcards, removedcards)):
  # monitor will poll forever...
  cardmonitor.deleteObserver(selectobserver)
 
- import sys
  if 'win32' == sys.platform:
  print 'press Enter to continue'
  sys.stdin.read(1)
-
-except:
- print exc_info()[0], ':', exc_info()[1]

smartcard/Examples/framework/sample_MonitorReaders.py

@@ -24,7 +24,7 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
-from sys import stdin, exc_info
+import sys
 from time import sleep
 
 from smartcard.ReaderMonitoring import ReaderMonitor, ReaderObserver
@@ -40,7 +40,7 @@ def update(self, observable, (addedreaders, removedreaders)):
  print "Added readers", addedreaders
  print "Removed readers", removedreaders
 
-try:
+if __name__ == '__main__':
  print "Add or remove a smartcard reader to the system."
  print "This program will exit in 10 seconds"
  print ""
@@ -54,10 +54,6 @@ def update(self, observable, (addedreaders, removedreaders)):
  # monitor will poll forever...
  readermonitor.deleteObserver(readerobserver)
 
- import sys
  if 'win32' == sys.platform:
  print 'press Enter to continue'
  sys.stdin.read(1)
-
-except:
- print exc_info()[0], ':', exc_info()[1]

smartcard/Examples/framework/sample_TransmitCardObserver.py

@@ -24,7 +24,6 @@
 along with pyscard; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
-from sys import stdin, exc_info
 from time import sleep
 
 from smartcard.CardMonitoring import CardMonitor, CardObserver
@@ -57,7 +56,7 @@ def update(self, observable, (addedcards, removedcards)):
  if card in self.cards:
  self.cards.remove(card)
 
-try:
+if __name__ == '__main__':
  print "Insert or remove a smartcard in the system."
  print "This program will exit in 100 seconds"
  print ""
@@ -66,6 +65,3 @@ def update(self, observable, (addedcards, removedcards)):
  cardmonitor.addObserver(cardobserver)
 
  sleep(100)
-
-except:
- print exc_info()[0], ':', exc_info()[1]

smartcard/Examples/scard-api/sample_getATR.py

@@ -26,10 +26,12 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
+import sys
+
 from smartcard.scard import *
 import smartcard.util
 
-try:
+if __name__ == '__main__':
  hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
  if hresult != SCARD_S_SUCCESS:
  raise error(
@@ -86,10 +88,6 @@
  SCardGetErrorMessage(hresult))
  print 'Released context.'
 
-except Exception, e:
- print e
-
-import sys
-if 'win32' == sys.platform:
- print 'press Enter to continue'
- sys.stdin.read(1)
+ if 'win32' == sys.platform:
+ print 'press Enter to continue'
+ sys.stdin.read(1)

smartcard/Examples/scard-api/sample_getAttrib.py

@@ -27,6 +27,8 @@
 """
 
 import struct
+import sys
+
 from smartcard.scard import *
 import smartcard.util
 
@@ -90,7 +92,7 @@ def printAttribute(attrib, value):
  print apply(struct.pack, ['<' + 'B' * len(value)] + value)
 
 
-try:
+if __name__ == '__main__':
  hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
  if hresult != SCARD_S_SUCCESS:
  raise error(
@@ -149,10 +151,6 @@ def printAttribute(attrib, value):
  SCardGetErrorMessage(hresult))
  print 'Released context.'
 
-except Exception, e:
- print e
-
-import sys
-if 'win32' == sys.platform:
- print 'press Enter to continue'
- sys.stdin.read(1)
+ if 'win32' == sys.platform:
+ print 'press Enter to continue'
+ sys.stdin.read(1)

smartcard/Examples/scard-api/sample_listInterfaces.py

@@ -26,6 +26,8 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
+import sys
+
 import platform
 from smartcard.scard import *
 import smartcard.guid
@@ -42,7 +44,7 @@
  znewcardSecGuid = \
  smartcard.guid.strToGUID('{EB7F69EA-BA20-47d0-8C50-11CFDEB63BBE}')
 
- try:
+ def main():
  hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
  if hresult != SCARD_S_SUCCESS:
  raise scard.error(
@@ -108,15 +110,13 @@
  SCardGetErrorMessage(hresult))
  print 'Released context.'
 
- except error:
- import sys
- print sys.exc_info()[0], ':', sys.exc_info()[1]
-
 elif 'pcsclite' == resourceManager:
- print 'SCardListInterfaces not supported by pcsc lite'
+ def main():
+ print 'SCardListInterfaces not supported by pcsc lite'
 
 
-import sys
-if 'win32' == sys.platform:
- print 'press Enter to continue'
- sys.stdin.read(1)
+if __name__ == '__main__':
+ main()
+ if 'win32' == sys.platform:
+ print 'press Enter to continue'
+ sys.stdin.read(1)

smartcard/Examples/simple/selectDF_TELECOM.py

@@ -65,10 +65,6 @@
 except CardRequestTimeoutException:
  print 'time-out: no card inserted during last 10s'
 
-except:
- import sys
- print sys.exc_info()[1]
-
 import sys
 if 'win32' == sys.platform:
  print 'press Enter to continue'

smartcard/Examples/simple/simpleAPDU.py

@@ -32,7 +32,7 @@
  0x18, 0xFF]
 GET_TIME = [0x80, 0x38, 0x00, 0xA0]
 
-try:
+if __name__ == '__main__':
  # get all the available readers
  r = readers()
  print "Available readers: ", r
@@ -51,6 +51,3 @@
 
  data, sw1, sw2 = connection.transmit(GET_TIME)
  print "Get Time: %02X %02X" % (sw1, sw2)
-
-except:
- print sys.exc_info()[1]

smartcard/Examples/wx/pcscdiag/pcscdiag.py

@@ -34,7 +34,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/ReaderMonitoring.py

@@ -28,9 +28,9 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
-from sys import exc_info
 from threading import Thread, Event, enumerate
 from time import sleep
+import traceback
 
 import smartcard.System
 from smartcard.Exceptions import ListReadersException
@@ -183,6 +183,8 @@ def run(self):
  self.stopEvent.wait(self.period)
 
  except Exception, e:
+ # FIXME Tighten the exceptions caught by this block
+ traceback.print_exc()
  # Most likely raised during interpreter shutdown due
  # to unclean exit which failed to remove all observers.
  # To solve this, we set the stop event and pass the

smartcard/System.py

@@ -60,10 +60,6 @@ def listReaders():
 
 
 if __name__ == '__main__':
- try:
- print readers()
- print readers(['SCard$DefaultReaders'])
- print readergroups()
- except:
- import sys
- print sys.exc_info()[1]
+ print readers()
+ print readers(['SCard$DefaultReaders'])
+ print readergroups()

smartcard/doc/user-guide.rst

@@ -1199,30 +1199,26 @@ To monitor reader insertion/removal, simply add the observer to the
 
 .. sourcecode:: python
 
- from sys import stdin, exc_info
+ from sys import stdin
  from time import sleep
 
  from smartcard.ReaderMonitoring import ReaderMonitor, ReaderObserver
 
- try:
- print "Add or remove a smartcard reader to the system."
- print "This program will exit in 10 seconds"
- print ""
- readermonitor = ReaderMonitor()
- readerobserver = printobserver()
- readermonitor.addObserver( readerobserver )
-
- sleep(10)
+ print "Add or remove a smartcard reader to the system."
+ print "This program will exit in 10 seconds"
+ print ""
+ readermonitor = ReaderMonitor()
+ readerobserver = printobserver()
+ readermonitor.addObserver( readerobserver )
 
- # don't forget to remove observer, or the
- # monitor will poll forever...
- readermonitor.deleteObserver(readerobserver)
+ sleep(10)
 
- print 'press Enter to continue'
- stdin.readline()
+ # don't forget to remove observer, or the
+ # monitor will poll forever...
+ readermonitor.deleteObserver(readerobserver)
 
- except error:
-  print exc_info()[0], ': ', exc_info()[1]
+ print 'press Enter to continue'
+ stdin.readline()
 
 Smart Cards
 ***********
@@ -1261,13 +1257,12 @@ card observer to the `CardMonitor
  for card in removedcards:
  print "-Removed: ", toHexString( card.atr )
 
- try:
- print "Insert or remove a smartcard in the system."
- print "This program will exit in 10 seconds"
- print ""
- cardmonitor = CardMonitor()
- cardobserver = printobserver()
- cardmonitor.addObserver( cardobserver )
+ print "Insert or remove a smartcard in the system."
+ print "This program will exit in 10 seconds"
+ print ""
+ cardmonitor = CardMonitor()
+ cardobserver = printobserver()
+ cardmonitor.addObserver( cardobserver )
 
 
 Sending APDUs to a Smart Card Obtained from Card Monitoring

smartcard/pyro/server/RemoteReaderServer.py

@@ -26,7 +26,7 @@
 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

smartcard/scard/__init__.py

@@ -1,4 +1,3 @@
-try:
- from scard import *
-except:
- from smartcard.scard._scard import *
+from __future__ import absolute_import
+
+from smartcard.scard.scard import *