From: <lu...@us...> - 2010-06-06 15:14:41
|
Revision: 428 http://pyscard.svn.sourceforge.net/pyscard/?rev=428&view=rev Author: ludov Date: 2010-06-06 15:14:35 +0000 (Sun, 06 Jun 2010) Log Message: ----------- make pep8 happy Modified Paths: -------------- trunk/pyscard/src/smartcard/pcsc/PCSCPart10.py Modified: trunk/pyscard/src/smartcard/pcsc/PCSCPart10.py =================================================================== --- trunk/pyscard/src/smartcard/pcsc/PCSCPart10.py 2010-06-06 15:10:44 UTC (rev 427) +++ trunk/pyscard/src/smartcard/pcsc/PCSCPart10.py 2010-06-06 15:14:35 UTC (rev 428) @@ -48,26 +48,25 @@ FEATURE_CCID_ESC_COMMAND = 0x13 Features = { -"FEATURE_VERIFY_PIN_START" : FEATURE_VERIFY_PIN_START, -"FEATURE_VERIFY_PIN_FINISH" : FEATURE_VERIFY_PIN_FINISH, -"FEATURE_MODIFY_PIN_START" : FEATURE_MODIFY_PIN_START, -"FEATURE_MODIFY_PIN_FINISH" : FEATURE_MODIFY_PIN_FINISH, -"FEATURE_GET_KEY_PRESSED" : FEATURE_GET_KEY_PRESSED, -"FEATURE_VERIFY_PIN_DIRECT" : FEATURE_VERIFY_PIN_DIRECT, -"FEATURE_MODIFY_PIN_DIRECT" : FEATURE_MODIFY_PIN_DIRECT, -"FEATURE_MCT_READER_DIRECT" : FEATURE_MCT_READER_DIRECT, -"FEATURE_MCT_UNIVERSAL" : FEATURE_MCT_UNIVERSAL, -"FEATURE_IFD_PIN_PROPERTIES" : FEATURE_IFD_PIN_PROPERTIES, -"FEATURE_ABORT" : FEATURE_ABORT, -"FEATURE_SET_SPE_MESSAGE" : FEATURE_SET_SPE_MESSAGE, -"FEATURE_VERIFY_PIN_DIRECT_APP_ID" : FEATURE_VERIFY_PIN_DIRECT_APP_ID, -"FEATURE_MODIFY_PIN_DIRECT_APP_ID" : FEATURE_MODIFY_PIN_DIRECT_APP_ID, -"FEATURE_WRITE_DISPLAY" : FEATURE_WRITE_DISPLAY, -"FEATURE_GET_KEY" : FEATURE_GET_KEY, -"FEATURE_IFD_DISPLAY_PROPERTIES" : FEATURE_IFD_DISPLAY_PROPERTIES, -"FEATURE_GET_TLV_PROPERTIES" : FEATURE_GET_TLV_PROPERTIES, -"FEATURE_CCID_ESC_COMMAND" : FEATURE_CCID_ESC_COMMAND -} +"FEATURE_VERIFY_PIN_START": FEATURE_VERIFY_PIN_START, +"FEATURE_VERIFY_PIN_FINISH": FEATURE_VERIFY_PIN_FINISH, +"FEATURE_MODIFY_PIN_START": FEATURE_MODIFY_PIN_START, +"FEATURE_MODIFY_PIN_FINISH": FEATURE_MODIFY_PIN_FINISH, +"FEATURE_GET_KEY_PRESSED": FEATURE_GET_KEY_PRESSED, +"FEATURE_VERIFY_PIN_DIRECT": FEATURE_VERIFY_PIN_DIRECT, +"FEATURE_MODIFY_PIN_DIRECT": FEATURE_MODIFY_PIN_DIRECT, +"FEATURE_MCT_READER_DIRECT": FEATURE_MCT_READER_DIRECT, +"FEATURE_MCT_UNIVERSAL": FEATURE_MCT_UNIVERSAL, +"FEATURE_IFD_PIN_PROPERTIES": FEATURE_IFD_PIN_PROPERTIES, +"FEATURE_ABORT": FEATURE_ABORT, +"FEATURE_SET_SPE_MESSAGE": FEATURE_SET_SPE_MESSAGE, +"FEATURE_VERIFY_PIN_DIRECT_APP_ID": FEATURE_VERIFY_PIN_DIRECT_APP_ID, +"FEATURE_MODIFY_PIN_DIRECT_APP_ID": FEATURE_MODIFY_PIN_DIRECT_APP_ID, +"FEATURE_WRITE_DISPLAY": FEATURE_WRITE_DISPLAY, +"FEATURE_GET_KEY": FEATURE_GET_KEY, +"FEATURE_IFD_DISPLAY_PROPERTIES": FEATURE_IFD_DISPLAY_PROPERTIES, +"FEATURE_GET_TLV_PROPERTIES": FEATURE_GET_TLV_PROPERTIES, +"FEATURE_CCID_ESC_COMMAND": FEATURE_CCID_ESC_COMMAND} # properties returned by FEATURE_GET_TLV_PROPERTIES PCSCv2_PART10_PROPERTY_wLcdLayout = 1 @@ -81,15 +80,14 @@ PCSCv2_PART10_PROPERTY_bPPDUSupport = 9 Properties = { -"PCSCv2_PART10_PROPERTY_wLcdLayout" : PCSCv2_PART10_PROPERTY_wLcdLayout, +"PCSCv2_PART10_PROPERTY_wLcdLayout": PCSCv2_PART10_PROPERTY_wLcdLayout, "PCSCv2_PART10_PROPERTY_bEntryValidationCondition": PCSCv2_PART10_PROPERTY_bEntryValidationCondition, "PCSCv2_PART10_PROPERTY_bTimeOut2": PCSCv2_PART10_PROPERTY_bTimeOut2, "PCSCv2_PART10_PROPERTY_wLcdMaxCharacters": PCSCv2_PART10_PROPERTY_wLcdMaxCharacters, "PCSCv2_PART10_PROPERTY_wLcdMaxLines": PCSCv2_PART10_PROPERTY_wLcdMaxLines, "PCSCv2_PART10_PROPERTY_bMinPINSize": PCSCv2_PART10_PROPERTY_bMinPINSize, "PCSCv2_PART10_PROPERTY_bMaxPINSize": PCSCv2_PART10_PROPERTY_bMaxPINSize, -"PCSCv2_PART10_PROPERTY_sFirmwareID": PCSCv2_PART10_PROPERTY_sFirmwareID -} +"PCSCv2_PART10_PROPERTY_sFirmwareID": PCSCv2_PART10_PROPERTY_sFirmwareID} # we already have: Features['FEATURE_x'] = FEATURE_x # we will now also have: Features[FEATURE_x] = 'FEATURE_x' @@ -147,7 +145,7 @@ controlCode = hasFeature(featureList, FEATURE_IFD_PIN_PROPERTIES) if controlCode is None: - return { 'raw': [] } + return {'raw': []} response = cardConnection.control(controlCode, []) d = { @@ -155,8 +153,7 @@ 'LcdLayoutX': response[0], 'LcdLayoutY': response[1], 'EntryValidationCondition': response[2], - 'TimeOut2': response[3] - } + 'TimeOut2': response[3]} return d @@ -175,7 +172,7 @@ controlCode = hasFeature(featureList, FEATURE_GET_TLV_PROPERTIES) if controlCode is None: - return { 'raw': [] } + return {'raw': []} response = cardConnection.control(controlCode, []) d = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |