[Pcsclite-cvs-commit] r6649 - /trunk/PCSC/src/spy/pcsc-spy
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Thu Jun 6 17:10:53 UTC 2013
Author: rousseau
Date: Thu Jun 6 17:10:50 2013
New Revision: 6649
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6649
Log:
Fix PEP8 warnings
E128 continuation line under-indented for visual indent
Modified:
trunk/PCSC/src/spy/pcsc-spy
Modified: trunk/PCSC/src/spy/pcsc-spy
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/spy/pcsc-spy?rev=6649&op=diff
==============================================================================
--- trunk/PCSC/src/spy/pcsc-spy (original)
+++ trunk/PCSC/src/spy/pcsc-spy Thu Jun 6 17:10:50 2013
@@ -216,30 +216,30 @@
""" log dwDisposition IN parameter """
dwDisposition = self.queue.get()
dispositions = {0: 'SCARD_LEAVE_CARD',
- 1: 'SCARD_RESET_CARD',
- 2: 'SCARD_UNPOWER_CARD',
- 3: 'SCARD_EJECT_CARD'}
+ 1: 'SCARD_RESET_CARD',
+ 2: 'SCARD_UNPOWER_CARD',
+ 3: 'SCARD_EJECT_CARD'}
try:
disposition = dispositions[int(dwDisposition, 16)]
except KeyError:
disposition = "UNKNOWN"
self.log_in("dwDisposition: %s (%s)" % (disposition,
- dwDisposition))
+ dwDisposition))
def log_in_attrid(self):
""" log dwAttrId IN parameter """
dwAttrId = self.queue.get()
attrids = {0x00010100: 'SCARD_ATTR_VENDOR_NAME',
- 0x00010102: 'SCARD_ATTR_VENDOR_IFD_VERSION',
- 0x00010103: 'SCARD_ATTR_VENDOR_IFD_SERIAL_NO',
- 0x0007A007: 'SCARD_ATTR_MAXINPUT',
- 0x00090300: 'SCARD_ATTR_ICC_PRESENCE',
- 0x00090301: 'SCARD_ATTR_ICC_INTERFACE_STATUS',
- 0x00090303: 'SCARD_ATTR_ATR_STRING',
- 0x7FFF0003: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_A',
- 0x7FFF0004: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_A',
- 0x7FFF0005: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_W',
- 0x7FFF0006: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_W'}
+ 0x00010102: 'SCARD_ATTR_VENDOR_IFD_VERSION',
+ 0x00010103: 'SCARD_ATTR_VENDOR_IFD_SERIAL_NO',
+ 0x0007A007: 'SCARD_ATTR_MAXINPUT',
+ 0x00090300: 'SCARD_ATTR_ICC_PRESENCE',
+ 0x00090301: 'SCARD_ATTR_ICC_INTERFACE_STATUS',
+ 0x00090303: 'SCARD_ATTR_ATR_STRING',
+ 0x7FFF0003: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_A',
+ 0x7FFF0004: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_A',
+ 0x7FFF0005: 'SCARD_ATTR_DEVICE_FRIENDLY_NAME_W',
+ 0x7FFF0006: 'SCARD_ATTR_DEVICE_SYSTEM_NAME_W'}
try:
attrid = attrids[int(dwAttrId, 16)]
except KeyError:
@@ -250,8 +250,8 @@
""" log dwShareMode IN parameter """
dwShareMode = self.queue.get()
sharemodes = {1: 'SCARD_SHARE_EXCLUSIVE',
- 2: 'SCARD_SHARE_SHARED',
- 3: 'SCARD_SHARE_DIRECT'}
+ 2: 'SCARD_SHARE_SHARED',
+ 3: 'SCARD_SHARE_DIRECT'}
try:
sharemode = sharemodes[int(dwShareMode, 16)]
except KeyError:
@@ -302,17 +302,17 @@
def _get_state(self, dwState):
""" parse dwCurrentState and dwEventState """
SCardStates = {0: 'SCARD_STATE_UNAWARE',
- 1: 'SCARD_STATE_IGNORE',
- 2: 'SCARD_STATE_CHANGED',
- 4: 'SCARD_STATE_UNKNOWN',
- 8: 'SCARD_STATE_UNAVAILABLE',
- 16: 'SCARD_STATE_EMPTY',
- 32: 'SCARD_STATE_PRESENT',
- 64: 'SCARD_STATE_ATRMATCH',
- 128: 'SCARD_STATE_EXCLUSIVE',
- 256: 'SCARD_STATE_INUSE',
- 512: 'SCARD_STATE_MUTE',
- 1024: 'SCARD_STATE_UNPOWERED'}
+ 1: 'SCARD_STATE_IGNORE',
+ 2: 'SCARD_STATE_CHANGED',
+ 4: 'SCARD_STATE_UNKNOWN',
+ 8: 'SCARD_STATE_UNAVAILABLE',
+ 16: 'SCARD_STATE_EMPTY',
+ 32: 'SCARD_STATE_PRESENT',
+ 64: 'SCARD_STATE_ATRMATCH',
+ 128: 'SCARD_STATE_EXCLUSIVE',
+ 256: 'SCARD_STATE_INUSE',
+ 512: 'SCARD_STATE_MUTE',
+ 1024: 'SCARD_STATE_UNPOWERED'}
state = list()
for bit in SCardStates.keys():
@@ -427,8 +427,8 @@
self.log_name("SCardEstablishContext")
dwScope = self.queue.get()
scopes = {0: 'SCARD_SCOPE_USER',
- 1: 'SCARD_SCOPE_TERMINAL',
- 2: 'SCARD_SCOPE_SYSTEM'}
+ 1: 'SCARD_SCOPE_TERMINAL',
+ 2: 'SCARD_SCOPE_SYSTEM'}
self.log_in("dwScope: %s (%s)" % (scopes[int(dwScope, 16)], dwScope))
self.log_out_hContext()
self._log_rv()
@@ -597,7 +597,7 @@
print " bmPINBlockString:", bSendBuffer[3]
print " bmPINLengthFormat:", bSendBuffer[4]
print " wPINMaxExtraDigit: 0x%02X%02X" % (bSendBuffer[6],
- bSendBuffer[5])
+ bSendBuffer[5])
print " Min:", bSendBuffer[6]
print " Max:", bSendBuffer[5]
print " bEntryValidationCondition:", bSendBuffer[7]
@@ -694,24 +694,24 @@
self.indent = " " * indent
self.features = {0x01: "FEATURE_VERIFY_PIN_START",
- 0x02: "FEATURE_VERIFY_PIN_FINISH",
- 0x03: "FEATURE_MODIFY_PIN_START",
- 0x04: "FEATURE_MODIFY_PIN_FINISH",
- 0x05: "FEATURE_GET_KEY_PRESSED",
- 0x06: "FEATURE_VERIFY_PIN_DIRECT",
- 0x07: "FEATURE_MODIFY_PIN_DIRECT",
- 0x08: "FEATURE_MCT_READER_DIRECT",
- 0x09: "FEATURE_MCT_UNIVERSAL",
- 0x0A: "FEATURE_IFD_PIN_PROPERTIES",
- 0x0B: "FEATURE_ABORT",
- 0x0C: "FEATURE_SET_SPE_MESSAGE",
- 0x0D: "FEATURE_VERIFY_PIN_DIRECT_APP_ID",
- 0x0E: "FEATURE_MODIFY_PIN_DIRECT_APP_ID",
- 0x0F: "FEATURE_WRITE_DISPLAY",
- 0x10: "FEATURE_GET_KEY",
- 0x11: "FEATURE_IFD_DISPLAY_PROPERTIES",
- 0x12: "FEATURE_GET_TLV_PROPERTIES",
- 0x13: "FEATURE_CCID_ESC_COMMAND"}
+ 0x02: "FEATURE_VERIFY_PIN_FINISH",
+ 0x03: "FEATURE_MODIFY_PIN_START",
+ 0x04: "FEATURE_MODIFY_PIN_FINISH",
+ 0x05: "FEATURE_GET_KEY_PRESSED",
+ 0x06: "FEATURE_VERIFY_PIN_DIRECT",
+ 0x07: "FEATURE_MODIFY_PIN_DIRECT",
+ 0x08: "FEATURE_MCT_READER_DIRECT",
+ 0x09: "FEATURE_MCT_UNIVERSAL",
+ 0x0A: "FEATURE_IFD_PIN_PROPERTIES",
+ 0x0B: "FEATURE_ABORT",
+ 0x0C: "FEATURE_SET_SPE_MESSAGE",
+ 0x0D: "FEATURE_VERIFY_PIN_DIRECT_APP_ID",
+ 0x0E: "FEATURE_MODIFY_PIN_DIRECT_APP_ID",
+ 0x0F: "FEATURE_WRITE_DISPLAY",
+ 0x10: "FEATURE_GET_KEY",
+ 0x11: "FEATURE_IFD_DISPLAY_PROPERTIES",
+ 0x12: "FEATURE_GET_TLV_PROPERTIES",
+ 0x13: "FEATURE_CCID_ESC_COMMAND"}
def SCARD_CTL_CODE(code):
return 0x42000000 + code
@@ -896,7 +896,7 @@
print "Results sorted by total execution time"
print "total time: %f sec" % total_time
for record in sorted(records, key=attrgetter('total_time'),
- reverse=True):
+ reverse=True):
print "%f sec (%3d calls) %5.2f%% %s" % (record.total_time,
record.occurences, record.total_time / total_time * 100.,
record.name)
More information about the Pcsclite-cvs-commit
mailing list