Revert differences to upstream@81bfc15

.gitignore

@@ -17,4 +17,3 @@ smartcard/scard/scard_wrap.c
 
 # Generated by test suite
 smartcard/test/local_config.py
-

smartcard/Card.py

@@ -21,6 +21,7 @@
 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,6 +24,8 @@
 """
 
 from smartcard.CardConnectionEvent import CardConnectionEvent
+from smartcard.Exceptions import SmartcardException
+from smartcard.Observer import Observer
 from smartcard.Observer import Observable
 
 

smartcard/CardMonitoring.py

@@ -28,13 +28,16 @@
 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
 from smartcard.Observer import Observer
 from smartcard.Observer import Observable
 
+from smartcard.CardType import AnyCardType
 from smartcard.CardRequest import CardRequest
 
 _START_ON_DEMAND_ = False
@@ -183,9 +186,15 @@ def run(self):
  pass
  except AttributeError:
  pass
+
  except:
- # FIXME Tighten the exceptions caught by this block
- traceback.print_exc()
+ try:
+ import sys
+ print sys.exc_info()[1]
+ print sys.exc_info()[2]
+ print sys.exc_info()[0]
+ except:
+ pass
 
  # stop the thread by signaling stopEvent
  def stop(self):
@@ -213,6 +222,7 @@ 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

@@ -30,6 +30,7 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
+from smartcard.Exceptions import SmartcardException
 from smartcard.scard import *
 
 

smartcard/CardType.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 InvalidATRMaskLengthException
 from smartcard.System import readers
 from smartcard.util import toHexString
 

smartcard/ClassLoader.py

@@ -9,6 +9,10 @@
 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/framework/sample_MonitorCards.py

@@ -24,7 +24,7 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
-import sys
+from sys import stdin, exc_info
 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)
 
-if __name__ == '__main__':
+try:
  print "Insert or remove a smartcard in the system."
  print "This program will exit in 10 seconds"
  print ""
@@ -58,6 +58,10 @@ 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
 """
 
-import sys
+from sys import stdin, exc_info
 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)
 
-if __name__ == '__main__':
+try:
  print "Insert or remove a SIM card in the system."
  print "This program will exit in 60 seconds"
  print ""
@@ -77,6 +77,10 @@ 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
 """
 
-import sys
+from sys import stdin, exc_info
 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
 
-if __name__ == '__main__':
+try:
  print "Add or remove a smartcard reader to the system."
  print "This program will exit in 10 seconds"
  print ""
@@ -54,6 +54,10 @@ 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,6 +24,7 @@
 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
@@ -56,7 +57,7 @@ def update(self, observable, (addedcards, removedcards)):
  if card in self.cards:
  self.cards.remove(card)
 
-if __name__ == '__main__':
+try:
  print "Insert or remove a smartcard in the system."
  print "This program will exit in 100 seconds"
  print ""
@@ -65,3 +66,6 @@ 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,12 +26,10 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
 
-import sys
-
 from smartcard.scard import *
 import smartcard.util
 
-if __name__ == '__main__':
+try:
  hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
  if hresult != SCARD_S_SUCCESS:
  raise error(
@@ -88,6 +86,10 @@
  SCardGetErrorMessage(hresult))
  print 'Released context.'
 
- if 'win32' == sys.platform:
- print 'press Enter to continue'
- sys.stdin.read(1)
+except Exception, e:
+ print e
+
+import sys
+if 'win32' == sys.platform:
+ print 'press Enter to continue'
+ sys.stdin.read(1)

smartcard/Examples/scard-api/sample_getAttrib.py

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

smartcard/Examples/scard-api/sample_listInterfaces.py

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

smartcard/Examples/simple/selectDF_TELECOM.py

@@ -65,6 +65,10 @@
 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]
 
-if __name__ == '__main__':
+try:
  # get all the available readers
  r = readers()
  print "Available readers: ", r
@@ -51,3 +51,6 @@
 
  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 ImportError:
+except:
  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

@@ -21,6 +21,7 @@
 along with pyscard; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
+from smartcard.CardConnection import CardConnection
 from smartcard.CardConnectionDecorator import CardConnectionDecorator
 from smartcard.Exceptions import CardConnectionException
 from smartcard.scard import SCardConnect, SCardDisconnect

smartcard/ExclusiveTransmitCardConnection.py

@@ -21,11 +21,13 @@
 along with pyscard; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 """
+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/Observer.py

@@ -19,7 +19,7 @@
 
 class Observer(object):
 
- def update(self, observable, arg):
+ def update(observable, arg):
  '''Called when the observed object is
  modified. You call an Observable object's
  notifyObservers method to notify all the

smartcard/PassThruCardService.py

@@ -53,6 +53,7 @@ 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()