From: <lu...@us...> - 2010-04-29 13:57:34
|
Revision: 399 http://pyscard.svn.sourceforge.net/pyscard/?rev=399&view=rev Author: ludov Date: 2010-04-29 13:57:24 +0000 (Thu, 29 Apr 2010) Log Message: ----------- fix whitespaces issues reported by pep8 Modified Paths: -------------- trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_getAttrib.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_getStatusChange.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_listCards.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_listInterfaces.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_locateCards.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_readerGroups.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_readers.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_selectDFTelecom.py trunk/pyscard/src/smartcard/Examples/scard-api/sample_transaction.py Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py 2010-04-29 13:57:24 UTC (rev 399) @@ -5,7 +5,7 @@ __author__ = "Ludovic Rousseau" -Copyright 2007 Ludovic Rousseau +Copyright 2007-2010 Ludovic Rousseau Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -29,18 +29,18 @@ from smartcard.util import toBytes try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers:', readers - if len(readers)<1: + if len(readers) < 1: raise error, 'No smart card readers' for zreader in readers: @@ -49,33 +49,33 @@ try: hresult, hcard, dwActiveProtocol = SCardConnect( - hcontext, zreader, SCARD_SHARE_DIRECT, SCARD_PROTOCOL_T0 ) - if hresult!=SCARD_S_SUCCESS: + hcontext, zreader, SCARD_SHARE_DIRECT, SCARD_PROTOCOL_T0) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to connect: ' + SCardGetErrorMessage(hresult) print 'Connected with active protocol', dwActiveProtocol try: - if 'winscard'==resourceManager: + if 'winscard' == resourceManager: # IOCTL_SMARTCARD_GET_ATTRIBUTE = SCARD_CTL_CODE(2) - hresult, response = SCardControl( hcard, SCARD_CTL_CODE(2), toBytes( "%.8lx" % SCARD_ATTR_VENDOR_NAME ) ) - if hresult!=SCARD_S_SUCCESS: + hresult, response = SCardControl(hcard, SCARD_CTL_CODE(2), toBytes("%.8lx" % SCARD_ATTR_VENDOR_NAME)) + if hresult != SCARD_S_SUCCESS: raise error, 'SCardControl failed: ' + SCardGetErrorMessage(hresult) r = "" for i in xrange(len(response)): r += "%c" % response[i] print 'SCARD_ATTR_VENDOR_NAME:', r - elif 'pcsclite'==resourceManager and not 'pcsclite-tiger'==resourceManagerSubType: + elif 'pcsclite' == resourceManager and not 'pcsclite-tiger' == resourceManagerSubType: # get firmware on Gemplus readers - hresult, response = SCardControl( hcard, SCARD_CTL_CODE(1), [ 0x02]) - if hresult!=SCARD_S_SUCCESS: + hresult, response = SCardControl(hcard, SCARD_CTL_CODE(1), [0x02]) + if hresult != SCARD_S_SUCCESS: raise error, 'SCardControl failed: ' + SCardGetErrorMessage(hresult) r = "" for i in xrange(len(response)): r += "%c" % response[i] print 'Control:', r finally: - hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to disconnect: ' + SCardGetErrorMessage(hresult) print 'Disconnected' @@ -83,8 +83,8 @@ print error, message finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' @@ -93,6 +93,6 @@ print sys.exc_info()[0], ':', sys.exc_info()[1] import sys -if 'win32'==sys.platform: +if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -28,16 +30,16 @@ import smartcard.util try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) - if len(readers)<1: + if len(readers) < 1: raise Exception('No smart card readers') print 'PCSC Readers:', readers @@ -45,16 +47,16 @@ print 'Trying to retreive ATR of card in', reader hresult, hcard, dwActiveProtocol = SCardConnect( - hcontext, reader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1 ) - if hresult!=SCARD_S_SUCCESS: + hcontext, reader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1) + if hresult != SCARD_S_SUCCESS: print 'Unable to connect: ' + SCardGetErrorMessage(hresult) else: print 'Connected with active protocol', dwActiveProtocol try: - hresult, reader, state, protocol, atr = SCardStatus( hcard ) - if hresult!=SCARD_S_SUCCESS: + hresult, reader, state, protocol, atr = SCardStatus(hcard) + if hresult != SCARD_S_SUCCESS: print 'failed to get status: ' + SCardGetErrorMessage(hresult) print 'Reader:', reader print 'State:', state @@ -62,15 +64,15 @@ print 'ATR:', smartcard.util.toHexString(atr, smartcard.util.HEX) finally: - hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD) + if hresult != SCARD_S_SUCCESS: print 'Failed to disconnect: ' + SCardGetErrorMessage(hresult) print 'Disconnected' finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' @@ -79,6 +81,6 @@ print sys.exc_info()[0], ':', sys.exc_info()[1] import sys -if 'win32'==sys.platform: +if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_getAttrib.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_getAttrib.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_getAttrib.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -32,84 +34,82 @@ attributes = {} else: attributes = { - SCARD_ATTR_ATR_STRING : 'SCARD_ATTR_ATR_STRING' , - SCARD_ATTR_CHANNEL_ID : 'SCARD_ATTR_CHANNEL_ID' , - SCARD_ATTR_CHARACTERISTICS : 'SCARD_ATTR_CHARACTERISTICS' , - SCARD_ATTR_CURRENT_BWT : 'SCARD_ATTR_CURRENT_BWT' , - SCARD_ATTR_CURRENT_CLK : 'SCARD_ATTR_CURRENT_CLK' , - SCARD_ATTR_CURRENT_CWT : 'SCARD_ATTR_CURRENT_CWT' , - SCARD_ATTR_CURRENT_D : 'SCARD_ATTR_CURRENT_D' , - SCARD_ATTR_CURRENT_EBC_ENCODING : 'SCARD_ATTR_CURRENT_EBC_ENCODING' , - SCARD_ATTR_CURRENT_F : 'SCARD_ATTR_CURRENT_F' , - SCARD_ATTR_CURRENT_IFSC : 'SCARD_ATTR_CURRENT_IFSC' , - SCARD_ATTR_CURRENT_IFSD : 'SCARD_ATTR_CURRENT_IFSD' , - SCARD_ATTR_CURRENT_IO_STATE : 'SCARD_ATTR_CURRENT_IO_STATE' , - SCARD_ATTR_CURRENT_N : 'SCARD_ATTR_CURRENT_N' , - SCARD_ATTR_CURRENT_PROTOCOL_TYPE : 'SCARD_ATTR_CURRENT_PROTOCOL_TYPE' , - SCARD_ATTR_CURRENT_W : 'SCARD_ATTR_CURRENT_W' , - SCARD_ATTR_DEFAULT_CLK : 'SCARD_ATTR_DEFAULT_CLK' , - SCARD_ATTR_DEFAULT_DATA_RATE : 'SCARD_ATTR_DEFAULT_DATA_RATE' , - SCARD_ATTR_DEVICE_FRIENDLY_NAME_A : 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_A' , - SCARD_ATTR_DEVICE_FRIENDLY_NAME_W : 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_W' , - SCARD_ATTR_DEVICE_IN_USE : 'SCARD_ATTR_DEVICE_IN_USE' , - SCARD_ATTR_DEVICE_SYSTEM_NAME_A : 'SCARD_ATTR_DEVICE_SYSTEM_NAME_A' , - SCARD_ATTR_DEVICE_SYSTEM_NAME_W : 'SCARD_ATTR_DEVICE_SYSTEM_NAME_W' , - SCARD_ATTR_DEVICE_UNIT : 'SCARD_ATTR_DEVICE_UNIT' , - SCARD_ATTR_ESC_AUTHREQUEST : 'SCARD_ATTR_ESC_AUTHREQUEST' , - SCARD_ATTR_ESC_CANCEL : 'SCARD_ATTR_ESC_CANCEL' , - SCARD_ATTR_ESC_RESET : 'SCARD_ATTR_ESC_RESET' , - SCARD_ATTR_EXTENDED_BWT : 'SCARD_ATTR_EXTENDED_BWT' , - SCARD_ATTR_ICC_INTERFACE_STATUS : 'SCARD_ATTR_ICC_INTERFACE_STATUS' , - SCARD_ATTR_ICC_PRESENCE : 'SCARD_ATTR_ICC_PRESENCE' , - SCARD_ATTR_ICC_TYPE_PER_ATR : 'SCARD_ATTR_ICC_TYPE_PER_ATR' , - SCARD_ATTR_MAXINPUT : 'SCARD_ATTR_MAXINPUT' , - SCARD_ATTR_MAX_CLK : 'SCARD_ATTR_MAX_CLK' , - SCARD_ATTR_MAX_DATA_RATE : 'SCARD_ATTR_MAX_DATA_RATE' , - SCARD_ATTR_MAX_IFSD : 'SCARD_ATTR_MAX_IFSD' , - SCARD_ATTR_POWER_MGMT_SUPPORT : 'SCARD_ATTR_POWER_MGMT_SUPPORT' , - SCARD_ATTR_SUPRESS_T1_IFS_REQUEST : 'SCARD_ATTR_SUPRESS_T1_IFS_REQUEST' , - SCARD_ATTR_USER_AUTH_INPUT_DEVICE : 'SCARD_ATTR_USER_AUTH_INPUT_DEVICE' , - SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE : 'SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE' , - SCARD_ATTR_VENDOR_IFD_SERIAL_NO : 'SCARD_ATTR_VENDOR_IFD_SERIAL_NO' , - SCARD_ATTR_VENDOR_IFD_TYPE : 'SCARD_ATTR_VENDOR_IFD_TYPE' , - SCARD_ATTR_VENDOR_IFD_VERSION : 'SCARD_ATTR_VENDOR_IFD_VERSION' , - SCARD_ATTR_VENDOR_NAME : 'SCARD_ATTR_VENDOR_NAME' - } - if 'pcsclite'==resourceManager: + SCARD_ATTR_ATR_STRING: 'SCARD_ATTR_ATR_STRING', + SCARD_ATTR_CHANNEL_ID: 'SCARD_ATTR_CHANNEL_ID', + SCARD_ATTR_CHARACTERISTICS: 'SCARD_ATTR_CHARACTERISTICS', + SCARD_ATTR_CURRENT_BWT: 'SCARD_ATTR_CURRENT_BWT', + SCARD_ATTR_CURRENT_CLK: 'SCARD_ATTR_CURRENT_CLK', + SCARD_ATTR_CURRENT_CWT: 'SCARD_ATTR_CURRENT_CWT', + SCARD_ATTR_CURRENT_D: 'SCARD_ATTR_CURRENT_D', + SCARD_ATTR_CURRENT_EBC_ENCODING: 'SCARD_ATTR_CURRENT_EBC_ENCODING', + SCARD_ATTR_CURRENT_F: 'SCARD_ATTR_CURRENT_F', + SCARD_ATTR_CURRENT_IFSC: 'SCARD_ATTR_CURRENT_IFSC', + SCARD_ATTR_CURRENT_IFSD: 'SCARD_ATTR_CURRENT_IFSD', + SCARD_ATTR_CURRENT_IO_STATE: 'SCARD_ATTR_CURRENT_IO_STATE', + SCARD_ATTR_CURRENT_N: 'SCARD_ATTR_CURRENT_N', + SCARD_ATTR_CURRENT_PROTOCOL_TYPE: 'SCARD_ATTR_CURRENT_PROTOCOL_TYPE', + SCARD_ATTR_CURRENT_W: 'SCARD_ATTR_CURRENT_W', + SCARD_ATTR_DEFAULT_CLK: 'SCARD_ATTR_DEFAULT_CLK', + SCARD_ATTR_DEFAULT_DATA_RATE: 'SCARD_ATTR_DEFAULT_DATA_RATE', + SCARD_ATTR_DEVICE_FRIENDLY_NAME_A: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_A', + SCARD_ATTR_DEVICE_FRIENDLY_NAME_W: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_W', + SCARD_ATTR_DEVICE_IN_USE: 'SCARD_ATTR_DEVICE_IN_USE', + SCARD_ATTR_DEVICE_SYSTEM_NAME_A: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_A', + SCARD_ATTR_DEVICE_SYSTEM_NAME_W: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_W', + SCARD_ATTR_DEVICE_UNIT: 'SCARD_ATTR_DEVICE_UNIT', + SCARD_ATTR_ESC_AUTHREQUEST: 'SCARD_ATTR_ESC_AUTHREQUEST', + SCARD_ATTR_ESC_CANCEL: 'SCARD_ATTR_ESC_CANCEL', + SCARD_ATTR_ESC_RESET: 'SCARD_ATTR_ESC_RESET', + SCARD_ATTR_EXTENDED_BWT: 'SCARD_ATTR_EXTENDED_BWT', + SCARD_ATTR_ICC_INTERFACE_STATUS: 'SCARD_ATTR_ICC_INTERFACE_STATUS', + SCARD_ATTR_ICC_PRESENCE: 'SCARD_ATTR_ICC_PRESENCE', + SCARD_ATTR_ICC_TYPE_PER_ATR: 'SCARD_ATTR_ICC_TYPE_PER_ATR', + SCARD_ATTR_MAXINPUT: 'SCARD_ATTR_MAXINPUT', + SCARD_ATTR_MAX_CLK: 'SCARD_ATTR_MAX_CLK', + SCARD_ATTR_MAX_DATA_RATE: 'SCARD_ATTR_MAX_DATA_RATE', + SCARD_ATTR_MAX_IFSD: 'SCARD_ATTR_MAX_IFSD', + SCARD_ATTR_POWER_MGMT_SUPPORT: 'SCARD_ATTR_POWER_MGMT_SUPPORT', + SCARD_ATTR_SUPRESS_T1_IFS_REQUEST: 'SCARD_ATTR_SUPRESS_T1_IFS_REQUEST', + SCARD_ATTR_USER_AUTH_INPUT_DEVICE: 'SCARD_ATTR_USER_AUTH_INPUT_DEVICE', + SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE: 'SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE', + SCARD_ATTR_VENDOR_IFD_SERIAL_NO: 'SCARD_ATTR_VENDOR_IFD_SERIAL_NO', + SCARD_ATTR_VENDOR_IFD_TYPE: 'SCARD_ATTR_VENDOR_IFD_TYPE', + SCARD_ATTR_VENDOR_IFD_VERSION: 'SCARD_ATTR_VENDOR_IFD_VERSION', + SCARD_ATTR_VENDOR_NAME: 'SCARD_ATTR_VENDOR_NAME'} + if 'pcsclite' == resourceManager: extra_attributes = { - SCARD_ATTR_ASYNC_PROTOCOL_TYPES : 'SCARD_ATTR_ASYNC_PROTOCOL_TYPES', - SCARD_ATTR_SYNC_PROTOCOL_TYPES : 'SCARD_ATTR_SYNC_PROTOCOL_TYPES', - } + SCARD_ATTR_ASYNC_PROTOCOL_TYPES: 'SCARD_ATTR_ASYNC_PROTOCOL_TYPES', + SCARD_ATTR_SYNC_PROTOCOL_TYPES: 'SCARD_ATTR_SYNC_PROTOCOL_TYPES'} attributes.update(extra_attributes) -def printAttribute( attrib, value ): +def printAttribute(attrib, value): print '-----------------', attributes[attrib], '-----------------' print value print smartcard.util.toHexString(value, smartcard.util.HEX) - print apply( struct.pack, [ '<' + 'B' * len(value)] + value ) + print apply(struct.pack, ['<' + 'B' * len(value)] + value) try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Faile to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers:', readers - if len(readers)<1: + if len(readers) < 1: raise error, 'No smart card readers' print 'Trying to retreive attributes of', readers[0] for reader in readers: hresult, hcard, dwActiveProtocol = SCardConnect( - hcontext, reader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1 ) - if hresult!=SCARD_S_SUCCESS: + hcontext, reader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1) + if hresult != SCARD_S_SUCCESS: print error, 'Unable to connect: ' + SCardGetErrorMessage(hresult) else: @@ -117,22 +117,22 @@ try: for i in attributes.keys(): - hresult, attrib = SCardGetAttrib( hcard, i ) - if hresult==SCARD_S_SUCCESS: - printAttribute( i, attrib ) + hresult, attrib = SCardGetAttrib(hcard, i) + if hresult == SCARD_S_SUCCESS: + printAttribute(i, attrib) else: print '-----------------', attributes[i], '-----------------' print 'unsupported' finally: - hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to disconnect: ' + SCardGetErrorMessage(hresult) print 'Disconnected' finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' @@ -141,6 +141,6 @@ print sys.exc_info()[0], ':', sys.exc_info()[1] import sys -if 'win32'==sys.platform: +if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_getStatusChange.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_getStatusChange.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_getStatusChange.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -28,8 +30,9 @@ import smartcard.util srTreeATR = [0x3B, 0x77, 0x94, 0x00, 0x00, 0x82, 0x30, 0x00, 0x13, 0x6C, 0x9F, 0x22] -srTreeMask= [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF] +srTreeMask = [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF] + def printstate(state): reader, eventstate, atr = state print reader + " " + smartcard.util.toHexString(atr, smartcard.util.HEX) @@ -58,42 +61,42 @@ try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers:', readers readerstates = [] for i in xrange(len(readers)): - readerstates += [ (readers[i], SCARD_STATE_UNAWARE ) ] + readerstates += [(readers[i], SCARD_STATE_UNAWARE)] print '----- Current reader and card states are: -------' - hresult, newstates = SCardGetStatusChange( hcontext, 0, readerstates ) + hresult, newstates = SCardGetStatusChange(hcontext, 0, readerstates) for i in newstates: - printstate( i ) + printstate(i) print '----- Please insert or remove a card ------------' - hresult, newstates = SCardGetStatusChange( hcontext, INFINITE, newstates ) + hresult, newstates = SCardGetStatusChange(hcontext, INFINITE, newstates) print '----- New reader and card states are: -----------' for i in newstates: - printstate( i ) + printstate(i) finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' import sys - if 'win32'==sys.platform: + if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_listCards.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_listCards.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_listCards.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -26,39 +28,39 @@ from smartcard.scard import * -if 'winscard'==resourceManager: +if 'winscard' == resourceManager: # Cryptoflex 8k v2 is introduced in standard Windows 2000 - slbCryptoFlex8kv2ATR = [ 0x3B, 0x95, 0x15, 0x40, 0x00, 0x68, 0x01, 0x02, 0x00, 0x00 ] + slbCryptoFlex8kv2ATR = [0x3B, 0x95, 0x15, 0x40, 0x00, 0x68, 0x01, 0x02, 0x00, 0x00] try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, card = SCardListCards( hcontext, slbCryptoFlex8kv2ATR, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, card = SCardListCards(hcontext, slbCryptoFlex8kv2ATR, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failure to locate Schlumberger Cryptoflex 8k v2 card: ' + SCardGetErrorMessage(hresult) print 'Located by ATR:', card - hresult, cards = SCardListCards( hcontext, [], [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, cards = SCardListCards(hcontext, [], []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failure to list cards: ' + SCardGetErrorMessage(hresult) print 'Cards:', cards for i in cards: hresult, providerguid = SCardGetCardTypeProviderName( - hcontext, i, SCARD_PROVIDER_PRIMARY ) - if hresult==SCARD_S_SUCCESS: + hcontext, i, SCARD_PROVIDER_PRIMARY) + if hresult == SCARD_S_SUCCESS: print i, 'Primary provider:', providername hresult, providername = SCardGetCardTypeProviderName( - hcontext, i, SCARD_PROVIDER_CSP ) - if hresult==SCARD_S_SUCCESS: + hcontext, i, SCARD_PROVIDER_CSP) + if hresult == SCARD_S_SUCCESS: print i, 'CSP Provider:', providername finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' @@ -66,11 +68,11 @@ import sys print sys.exc_info()[0], ':', sys.exc_info()[1] -elif 'pcsclite'==resourceManager: +elif 'pcsclite' == resourceManager: print 'SCardListCards not supported by pcsc lite' import sys -if 'win32'==sys.platform: +if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_listInterfaces.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_listInterfaces.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_listInterfaces.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -27,53 +29,53 @@ from smartcard.scard import * import smartcard.guid -if 'winscard'==resourceManager: +if 'winscard' == resourceManager: znewcardName = 'dummy-card' znewcardATR = [0x3B, 0x77, 0x94, 0x00, 0x00, 0x82, 0x30, 0x00, 0x13, 0x6C, 0x9F, 0x22] - znewcardMask= [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF] + znewcardMask = [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF] znewcardPrimGuid = smartcard.guid.strToGUID('{128F3806-4F70-4ccf-977A-60C390664840}') znewcardSecGuid = smartcard.guid.strToGUID('{EB7F69EA-BA20-47d0-8C50-11CFDEB63BBE}') try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise scard.error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: # list interfaces for a known card - hresult, interfaces = SCardListInterfaces( hcontext, 'Schlumberger Cryptoflex 8k v2' ) - if hresult!=SCARD_S_SUCCESS: + hresult, interfaces = SCardListInterfaces(hcontext, 'Schlumberger Cryptoflex 8k v2') + if hresult != SCARD_S_SUCCESS: raise scard.error, 'Failed to list interfaces: ' + SCardGetErrorMessage(hresult) print 'Interfaces for Schlumberger Cryptoflex 8k v2:', interfaces # introduce a card (forget first in case it is already present) - hresult = SCardForgetCardType( hcontext, znewcardName ) + hresult = SCardForgetCardType(hcontext, znewcardName) print 'Introducing card ' + znewcardName - hresult = SCardIntroduceCardType( hcontext, znewcardName, znewcardPrimGuid, - znewcardPrimGuid + znewcardSecGuid, znewcardATR, znewcardMask ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardIntroduceCardType(hcontext, znewcardName, znewcardPrimGuid, + znewcardPrimGuid + znewcardSecGuid, znewcardATR, znewcardMask) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to introduce card type: ' + SCardGetErrorMessage(hresult) # list card interfaces - hresult, interfaces = SCardListInterfaces( hcontext, znewcardName ) - if hresult!=SCARD_S_SUCCESS: + hresult, interfaces = SCardListInterfaces(hcontext, znewcardName) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list interfaces: ' + SCardGetErrorMessage(hresult) for i in interfaces: print 'Interface for ' + znewcardName + ' :', smartcard.guid.GUIDToStr(i) print 'Forgeting card ' + znewcardName - hresult = SCardForgetCardType( hcontext, znewcardName ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardForgetCardType(hcontext, znewcardName) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to remove card type: ' + SCardGetErrorMessage(hresult) finally: - hresult2 = SCardReleaseContext( hcontext ) - if hresult2!=SCARD_S_SUCCESS: + hresult2 = SCardReleaseContext(hcontext) + if hresult2 != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' @@ -81,11 +83,11 @@ import sys print sys.exc_info()[0], ':', sys.exc_info()[1] -elif 'pcsclite'==resourceManager: +elif 'pcsclite' == resourceManager: print 'SCardListInterfaces not supported by pcsc lite' import sys -if 'win32'==sys.platform: +if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_locateCards.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_locateCards.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_locateCards.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -26,47 +28,47 @@ from smartcard.scard import * -if 'winscard'==resourceManager: +if 'winscard' == resourceManager: znewcardName = 'dummy-card' znewcardATR = [0x3B, 0x77, 0x94, 0x00, 0x00, 0x82, 0x30, 0x00, 0x13, 0x6C, 0x9F, 0x22] - znewcardMask= [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF] + znewcardMask = [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF] try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise scard.error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise scard.error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers:', readers # introduce a card (forget first in case it is already present) - hresult = SCardForgetCardType( hcontext, znewcardName ) + hresult = SCardForgetCardType(hcontext, znewcardName) print 'Introducing card ' + znewcardName - hresult = SCardIntroduceCardType( hcontext, znewcardName, [], - [], znewcardATR, znewcardMask ) - if hresult!=SCARD_S_SUCCESS: - if hresult==ERROR_ALREADY_EXISTS: + hresult = SCardIntroduceCardType(hcontext, znewcardName, [], + [], znewcardATR, znewcardMask) + if hresult != SCARD_S_SUCCESS: + if hresult == ERROR_ALREADY_EXISTS: print 'Card already exists' else: raise error, 'Failed to introduce card type: ' + SCardGetErrorMessage(hresult) - hresult, cards = SCardListCards( hcontext, [], [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, cards = SCardListCards(hcontext, [], []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failure to list cards' print 'Cards:', cards readerstates = [] for i in xrange(len(readers)): - readerstates += [ (readers[i], SCARD_STATE_UNAWARE ) ] + readerstates += [(readers[i], SCARD_STATE_UNAWARE)] print readerstates - hresult, newstates = SCardLocateCards( hcontext, cards, readerstates ) + hresult, newstates = SCardLocateCards(hcontext, cards, readerstates) for i in newstates: reader, eventstate, atr = i print reader, @@ -97,9 +99,9 @@ print 'State unknowned' finally: - hresult = SCardForgetCardType( hcontext, znewcardName ) - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardForgetCardType(hcontext, znewcardName) + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' @@ -107,11 +109,11 @@ import sys print sys.exc_info()[0], ':', sys.exc_info()[1] -elif 'pcsclite'==resourceManager: +elif 'pcsclite' == resourceManager: print 'SCardLocateCards not supported by pcsc lite' import sys -if 'win32'==sys.platform: +if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py 2010-04-29 13:57:24 UTC (rev 399) @@ -5,7 +5,7 @@ __author__ = "Ludovic Rousseau" -Copyright 2009 Ludovic Rousseau +Copyright 2009-2010 Ludovic Rousseau Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -28,50 +28,54 @@ from smartcard.scard import * from smartcard.util import toASCIIBytes + def can_do_verify_pin(hCard): FEATURE_VERIFY_PIN_DIRECT = 6 return parse_get_feature_request(hCard, FEATURE_VERIFY_PIN_DIRECT) + def can_do_modify_pin(hCard): FEATURE_MODIFY_PIN_DIRECT = 7 return parse_get_feature_request(hCard, FEATURE_MODIFY_PIN_DIRECT) + def parse_get_feature_request(hCard, feature): # check the reader can do a verify pin CM_IOCTL_GET_FEATURE_REQUEST = SCARD_CTL_CODE(3400) hresult, response = SCardControl(hcard, CM_IOCTL_GET_FEATURE_REQUEST, []) - if hresult!=SCARD_S_SUCCESS: + if hresult != SCARD_S_SUCCESS: raise error, 'SCardControl failed: ' + SCardGetErrorMessage(hresult) print response while (len(response) > 0): tag = response[0] if (feature == tag): - return (((((response[2]<<8) + response[3])<<8) + response[4])<<8) + response[5] + return (((((response[2] << 8) + response[3]) << 8) + response[4]) << 8) + response[5] response = response[6:] + def verifypin(hCard, control=None): - if None==control: + if None == control: control = can_do_verify_pin(hCard) if (None == control): raise error, "Not a pinpad" hresult, response = SCardControl(hcard, control, []) - if hresult!=SCARD_S_SUCCESS: + if hresult != SCARD_S_SUCCESS: raise error, 'SCardControl failed: ' + SCardGetErrorMessage(hresult) return hresult, response try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers:', readers - if len(readers)<1: + if len(readers) < 1: raise error, 'No smart card readers' for zreader in readers: @@ -81,7 +85,7 @@ try: hresult, hcard, dwActiveProtocol = SCardConnect( hcontext, zreader, SCARD_SHARE_DIRECT, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1) - if hresult!=SCARD_S_SUCCESS: + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to connect: ' + SCardGetErrorMessage(hresult) print 'Connected with active protocol', dwActiveProtocol @@ -100,8 +104,8 @@ r += "%c" % response[i] print 'Control:', r finally: - hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to disconnect: ' + SCardGetErrorMessage(hresult) print 'Disconnected' @@ -109,8 +113,8 @@ print error, message finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' @@ -119,6 +123,6 @@ print sys.exc_info()[0], ':', sys.exc_info()[1] import sys -if 'win32'==sys.platform: +if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_readerGroups.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_readerGroups.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_readerGroups.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -29,89 +31,89 @@ newgroup = 'MyReaderGroup' try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers in all groups:', readers - hresult, readerGroups = SCardListReaderGroups( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult, readerGroups = SCardListReaderGroups(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to list reader groups: ' + SCardGetErrorMessage(hresult) print 'PCSC Reader groups:', readerGroups - if 'winscard'==resourceManager: + if 'winscard' == resourceManager: - hresult = SCardIntroduceReaderGroup( hcontext, newgroup ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardIntroduceReaderGroup(hcontext, newgroup) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to introduce reader group: ' + SCardGetErrorMessage(hresult) dummyreader = readers[0] + ' dummy' - hresult = SCardIntroduceReader( hcontext, dummyreader, readers[0] ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardIntroduceReader(hcontext, dummyreader, readers[0]) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to introduce reader: ' + dummyreader + ' : ' + SCardGetErrorMessage(hresult) - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers in all groups:', readers - hresult = SCardAddReaderToGroup( hcontext, dummyreader, newgroup ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardAddReaderToGroup(hcontext, dummyreader, newgroup) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to add reader to group: ' + SCardGetErrorMessage(hresult) - hresult, readerGroups = SCardListReaderGroups( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult, readerGroups = SCardListReaderGroups(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to list reader groups: ' + SCardGetErrorMessage(hresult) print 'PCSC Reader groups:', readerGroups - hresult, readers = SCardListReaders( hcontext, [newgroup] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, [newgroup]) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers in group ' + newgroup + ' : ' + SCardGetErrorMessage(hresult) print 'PCSC Readers in reader group', newgroup, ':', readers - hresult = SCardRemoveReaderFromGroup( hcontext, dummyreader, newgroup ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardRemoveReaderFromGroup(hcontext, dummyreader, newgroup) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to remove reader from group: ' + SCardGetErrorMessage(hresult) - hresult, readerGroups = SCardListReaderGroups( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult, readerGroups = SCardListReaderGroups(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to list reader groups: ' + SCardGetErrorMessage(hresult) print 'PCSC Reader groups:', readerGroups - hresult = SCardForgetReaderGroup( hcontext, newgroup ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardForgetReaderGroup(hcontext, newgroup) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to forget reader group: ' + SCardGetErrorMessage(hresult) - hresult = SCardForgetReader( hcontext, dummyreader ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardForgetReader(hcontext, dummyreader) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to forget readers ' + SCardGetErrorMessage(hresult) - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers in all groups:', readers - elif 'pcsclite'==resourceManager: - hresult, readers = SCardListReaders( hcontext, readerGroups ) - if hresult!=SCARD_S_SUCCESS: - raise error, 'Failed to list readers in groups '+ `readerGroups` + ' : ' + SCardGetErrorMessage(hresult) + elif 'pcsclite' == resourceManager: + hresult, readers = SCardListReaders(hcontext, readerGroups) + if hresult != SCARD_S_SUCCESS: + raise error, 'Failed to list readers in groups ' + `readerGroups` + ' : ' + SCardGetErrorMessage(hresult) print 'PCSC Readers in reader group', readerGroups, ':', readers finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' import sys - if 'win32'==sys.platform: + if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_readers.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_readers.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_readers.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -27,30 +29,30 @@ from smartcard.scard import * try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers:', readers - hresult, readerGroups = SCardListReaderGroups( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult, readerGroups = SCardListReaderGroups(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to list reader groups: ' + SCardGetErrorMessage(hresult) print 'PCSC Reader groups:', readerGroups finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' import sys - if 'win32'==sys.platform: + if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_selectDFTelecom.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_selectDFTelecom.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_selectDFTelecom.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -32,18 +34,18 @@ GET_RESPONSE = [0xA0, 0xC0, 0x00, 0x00] try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to establish context : ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers:', readers - if len(readers)<1: + if len(readers) < 1: raise error, 'No smart card readers' for zreader in readers: @@ -52,23 +54,23 @@ try: hresult, hcard, dwActiveProtocol = SCardConnect( - hcontext, zreader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1 ) - if hresult!=SCARD_S_SUCCESS: + hcontext, zreader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1) + if hresult != SCARD_S_SUCCESS: raise error, 'Unable to connect: ' + SCardGetErrorMessage(hresult) print 'Connected with active protocol', dwActiveProtocol try: - hresult, response = SCardTransmit( hcard, dwActiveProtocol, SELECT + DF_TELECOM ) - if hresult!=SCARD_S_SUCCESS: + hresult, response = SCardTransmit(hcard, dwActiveProtocol, SELECT + DF_TELECOM) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to transmit: ' + SCardGetErrorMessage(hresult) print 'Selected DF_TELECOM: ' + smartcard.util.toHexString(response, smartcard.util.HEX) - hresult, response = SCardTransmit( hcard, dwActiveProtocol, GET_RESPONSE + [response[1]] ) - if hresult!=SCARD_S_SUCCESS: + hresult, response = SCardTransmit(hcard, dwActiveProtocol, GET_RESPONSE + [response[1]]) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to transmit: ' + SCardGetErrorMessage(hresult) print 'GET_RESPONSE after SELECT DF_TELECOM: ' + smartcard.util.toHexString(response, smartcard.util.HEX) finally: - hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to disconnect: ' + SCardGetErrorMessage(hresult) print 'Disconnected' @@ -76,8 +78,8 @@ print error, message finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' @@ -86,6 +88,6 @@ print sys.exc_info()[0], ':', sys.exc_info()[1] import sys -if 'win32'==sys.platform: +if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_transaction.py =================================================================== --- trunk/pyscard/src/smartcard/Examples/scard-api/sample_transaction.py 2010-04-21 14:33:55 UTC (rev 398) +++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_transaction.py 2010-04-29 13:57:24 UTC (rev 399) @@ -6,6 +6,8 @@ Copyright 2001-2010 gemalto Author: Jean-Daniel Aussel, mailto:jea...@ge... +Copyright 2010 Ludovic Rousseau +Author: Ludovic Rousseau, mailto:lud...@fr... This file is part of pyscard. @@ -26,20 +28,19 @@ from smartcard.scard import * - try: - hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER ) - if hresult!=SCARD_S_SUCCESS: + hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult) print 'Context established!' try: - hresult, readers = SCardListReaders( hcontext, [] ) - if hresult!=SCARD_S_SUCCESS: + hresult, readers = SCardListReaders(hcontext, []) + if hresult != SCARD_S_SUCCESS: raise error, 'Failed to list readers:: ' + SCardGetErrorMessage(hresult) print 'PCSC Readers:', readers - if len(readers)<1: + if len(readers) < 1: raise error, 'No smart card readers' for zreader in readers: @@ -48,18 +49,18 @@ try: hresult, hcard, dwActiveProtocol = SCardConnect( hcontext, zreader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1) - if hresult!=SCARD_S_SUCCESS: + if hresult != SCARD_S_SUCCESS: raise error, 'unable to connect: ' + SCardGetErrorMessage(hresult) print 'Connected with active protocol', dwActiveProtocol try: - hresult = SCardBeginTransaction( hcard ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardBeginTransaction(hcard) + if hresult != SCARD_S_SUCCESS: raise error, 'failed to begin transaction: ' + SCardGetErrorMessage(hresult) print 'Beginning transaction' - hresult, reader, state, protocol, atr = SCardStatus( hcard ) - if hresult!=SCARD_S_SUCCESS: + hresult, reader, state, protocol, atr = SCardStatus(hcard) + if hresult != SCARD_S_SUCCESS: raise error, 'failed to get status: ' + SCardGetErrorMessage(hresult) print 'ATR:', for i in xrange(len(atr)): @@ -67,21 +68,21 @@ print "" finally: - hresult = SCardEndTransaction( hcard, SCARD_LEAVE_CARD ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardEndTransaction(hcard, SCARD_LEAVE_CARD) + if hresult != SCARD_S_SUCCESS: raise error, 'failed to end transaction: ' + SCardGetErrorMessage(hresult) print 'Transaction ended' - hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD) + if hresult != SCARD_S_SUCCESS: raise error, 'failed to disconnect: ' + SCardGetErrorMessage(hresult) print 'Disconnected' except error, (message): print error, message finally: - hresult = SCardReleaseContext( hcontext ) - if hresult!=SCARD_S_SUCCESS: + hresult = SCardReleaseContext(hcontext) + if hresult != SCARD_S_SUCCESS: raise error, 'failed to release context: ' + SCardGetErrorMessage(hresult) print 'Released context.' @@ -90,6 +91,6 @@ print sys.exc_info()[0], ':', sys.exc_info()[1] import sys -if 'win32'==sys.platform: +if 'win32' == sys.platform: print 'press Enter to continue' sys.stdin.read(1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |