[Pcsclite-cvs-commit] r4560 - in /trunk/PCSC/UnitaryTests: ./ SCardGetStatusChange/
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Wed Nov 18 16:53:45 UTC 2009
Author: rousseau
Date: Wed Nov 18 16:53:44 2009
New Revision: 4560
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4560
Log:
reformat to make pep8(1) happy
Modified:
trunk/PCSC/UnitaryTests/MCT_ReaderDirect.py
trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py
trunk/PCSC/UnitaryTests/SCardCancel.py
trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py
trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange.py
trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_PnP.py
trunk/PCSC/UnitaryTests/SCardReconnect.py
trunk/PCSC/UnitaryTests/control_get_firmware.py
trunk/PCSC/UnitaryTests/control_switch_interface.py
Modified: trunk/PCSC/UnitaryTests/MCT_ReaderDirect.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/MCT_ReaderDirect.py?rev=4560&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/MCT_ReaderDirect.py (original)
+++ trunk/PCSC/UnitaryTests/MCT_ReaderDirect.py Wed Nov 18 16:53:44 2009
@@ -21,6 +21,7 @@
from smartcard.pcsc.PCSCPart10 import *
from smartcard.util import toHexString
+
def parse_info(bytes):
""" parse the SECODER INFO answer """
print "parse the SECODER INFO answer:", toHexString(bytes)
@@ -31,7 +32,7 @@
while len(bytes):
tag = bytes[0]
length = bytes[1]
- data = bytes[2:2+length]
+ data = bytes[2:2 + length]
print "tag: %02X, length: %2d:" % (tag, length),
if tag in [0x40, 0x80, 0x81, 0x83, 0x84]:
@@ -39,7 +40,7 @@
else:
print toHexString(data)
- del bytes[:2+length]
+ del bytes[:2 + length]
print "SW:", toHexString(sw)
@@ -65,13 +66,12 @@
if mct_readerDirect is None:
raise Exception("The reader does not support MCT_READERDIRECT")
-secoder_info = [ 0x20, 0x70, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 ]
+secoder_info = [0x20, 0x70, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00]
res = cardConnection.control(mct_readerDirect, secoder_info)
parse_info(res)
-secoder_select = [ 0x20, 0x71, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x80,
- 0x05, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x84, 0x02, 0x64, 0x65,
- 0x90, 0x01, 0x01, 0x85, 0x03, ord('g'), ord('k'), ord('p'), 0x00, 0x00 ]
+secoder_select = [0x20, 0x71, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x80,
+ 0x05, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x84, 0x02, 0x64, 0x65,
+ 0x90, 0x01, 0x01, 0x85, 0x03, ord('g'), ord('k'), ord('p'), 0x00, 0x00]
res = cardConnection.control(mct_readerDirect, secoder_select)
parse_select(res)
-
Modified: trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py?rev=4560&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py (original)
+++ trunk/PCSC/UnitaryTests/SCardBeginTransaction_Disconnect.py Wed Nov 18 16:53:44 2009
@@ -1,6 +1,6 @@
#! /usr/bin/env python
-# SCardBeginTransaction_Disconnect.py : Unitary test for # SCardDisconnect()
+# SCardBeginTransaction_Disconnect.py : Unitary test for SCardDisconnect()
# Copyright (C) 2009 Ludovic Rousseau
#
# This program is free software; you can redistribute it and/or modify
@@ -25,31 +25,30 @@
from smartcard.scard import *
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
hresult, readers = SCardListReaders(hcontext, [])
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
print 'PC/SC Readers:', readers
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0], SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
hresult = SCardBeginTransaction(hcard)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardBeginTransaction: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardBeginTransaction: ' + SCardGetErrorMessage(hresult))
hresult = SCardBeginTransaction(hcard)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardBeginTransaction: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardBeginTransaction: ' + SCardGetErrorMessage(hresult))
hresult = SCardDisconnect(hcard, SCARD_RESET_CARD)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
hresult = SCardReleaseContext(hcontext)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
-
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
Modified: trunk/PCSC/UnitaryTests/SCardCancel.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardCancel.py?rev=4560&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardCancel.py (original)
+++ trunk/PCSC/UnitaryTests/SCardCancel.py Wed Nov 18 16:53:44 2009
@@ -22,39 +22,40 @@
import threading
import time
+
def cancel():
time.sleep(1)
print "cancel"
hresult = SCardCancel(hcontext)
- if hresult!=0:
+ if hresult != 0:
print 'Failed to SCardCancel: ' + SCardGetErrorMessage(hresult)
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
hresult, readers = SCardListReaders(hcontext, [])
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
print 'PC/SC Readers:', readers
readerstates = {}
for reader in readers:
readerstates[reader] = (reader, SCARD_STATE_UNAWARE)
hresult, newstates = SCardGetStatusChange(hcontext, 0, readerstates.values())
-if hresult!=SCARD_S_SUCCESS:
+if hresult != SCARD_S_SUCCESS:
raise Exception('Failed to SCardGetStatusChange: ' + SCardGetErrorMessage(hresult))
print newstates
for state in newstates:
readername, eventstate, atr = state
- readerstates[readername] = ( readername, eventstate )
+ readerstates[readername] = (readername, eventstate)
t = threading.Thread(target=cancel)
t.start()
hresult, newstates = SCardGetStatusChange(hcontext, 10000, readerstates.values())
print "SCardGetStatusChange()", SCardGetErrorMessage(hresult)
-if hresult!=SCARD_S_SUCCESS and hresult!=SCARD_E_TIMEOUT:
+if hresult != SCARD_S_SUCCESS and hresult != SCARD_E_TIMEOUT:
if SCARD_E_CANCELLED == hresult:
pass
else:
@@ -62,6 +63,5 @@
hresult = SCardReleaseContext(hcontext)
print "SCardReleaseContext()", SCardGetErrorMessage(hresult)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
-
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
Modified: trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py?rev=4560&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py (original)
+++ trunk/PCSC/UnitaryTests/SCardConnect_DIRECT.py Wed Nov 18 16:53:44 2009
@@ -25,27 +25,27 @@
from smartcard.scard import *
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
hresult, readers = SCardListReaders(hcontext, [])
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
print 'PC/SC Readers:', readers
# Connect in SCARD_SHARE_SHARED mode
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
print "dwActiveProtocol:", dwActiveProtocol
# Reconnect in SCARD_SHARE_DIRECT mode
hresult, dwActiveProtocol = SCardReconnect(hcard,
SCARD_SHARE_DIRECT, SCARD_PROTOCOL_ANY, SCARD_LEAVE_CARD)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardReconnect: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardReconnect: ' + SCardGetErrorMessage(hresult))
# ActiveProtocol should be SCARD_PROTOCOL_UNDEFINED (0)
print "dwActiveProtocol:", dwActiveProtocol
@@ -53,9 +53,9 @@
raise Exception('dwActiveProtocol should be SCARD_PROTOCOL_UNDEFINED')
hresult = SCardDisconnect(hcard, SCARD_RESET_CARD)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
hresult = SCardReleaseContext(hcontext)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
Modified: trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange.py?rev=4560&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange.py (original)
+++ trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange.py Wed Nov 18 16:53:44 2009
@@ -30,7 +30,7 @@
# initialise the states of the readers
readerstates = {}
for reader in readers:
- readerstates[reader] = ( reader, SCARD_STATE_UNAWARE )
+ readerstates[reader] = (reader, SCARD_STATE_UNAWARE)
print "values", readerstates.values()
(hresult, states) = SCardGetStatusChange(hcontext, 0, readerstates.values())
print SCardGetErrorMessage(hresult)
@@ -41,7 +41,7 @@
print "readername:", readername
print "eventstate:", hex(eventstate)
print "atr:", atr
- readerstates[readername] = ( readername, eventstate )
+ readerstates[readername] = (readername, eventstate)
print "values", readerstates.values()
# wait for a change with a 10s timeout
@@ -54,8 +54,7 @@
print "readername:", readername
print "eventstate:", hex(eventstate)
print "atr:", atr
- readerstates[readername] = ( readername, eventstate )
+ readerstates[readername] = (readername, eventstate)
print "values", readerstates.values()
hresult = SCardReleaseContext(hcontext)
-
Modified: trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_PnP.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_PnP.py?rev=4560&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_PnP.py (original)
+++ trunk/PCSC/UnitaryTests/SCardGetStatusChange/SCardGetStatusChange_PnP.py Wed Nov 18 16:53:44 2009
@@ -25,6 +25,7 @@
import sys
+
def scardstate2text(cardstate):
state = list()
states_dict = {
@@ -39,8 +40,7 @@
SCARD_STATE_EXCLUSIVE: "SCARD_STATE_EXCLUSIVE",
SCARD_STATE_INUSE: "SCARD_STATE_INUSE",
SCARD_STATE_MUTE: "SCARD_STATE_MUTE",
- SCARD_STATE_UNPOWERED: "SCARD_STATE_UNPOWERED"
- }
+ SCARD_STATE_UNPOWERED: "SCARD_STATE_UNPOWERED"}
for s in states_dict.keys():
if (cardstate & s):
state.append(states_dict[s])
@@ -52,7 +52,7 @@
# initialise the states of the readers
readerstates = {}
for reader in readers:
- readerstates[reader] = ( reader, SCARD_STATE_UNAWARE )
+ readerstates[reader] = (reader, SCARD_STATE_UNAWARE)
print "values", readerstates.values()
(hresult, states) = SCardGetStatusChange(hcontext, 0, readerstates.values())
print SCardGetErrorMessage(hresult)
@@ -63,12 +63,12 @@
print "readername:", readername
print "eventstate:", scardstate2text(eventstate)
print "atr:", toHexString(atr)
- readerstates[readername] = ( readername, eventstate )
+ readerstates[readername] = (readername, eventstate)
print "values", readerstates.values()
# wait for a change with a 10s timeout
reader = "\\\\?PnP?\\Notification"
-readerstates[reader] = ( reader, SCARD_STATE_UNAWARE )
+readerstates[reader] = (reader, SCARD_STATE_UNAWARE)
(hresult, states) = SCardGetStatusChange(hcontext, 10000, readerstates.values())
print SCardGetErrorMessage(hresult)
@@ -79,8 +79,7 @@
print "readername:", readername
print "eventstate:", scardstate2text(eventstate)
print "atr:", toHexString(atr)
- readerstates[readername] = ( readername, eventstate )
+ readerstates[readername] = (readername, eventstate)
print "values", readerstates.values()
hresult = SCardReleaseContext(hcontext)
-
Modified: trunk/PCSC/UnitaryTests/SCardReconnect.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/SCardReconnect.py?rev=4560&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/SCardReconnect.py (original)
+++ trunk/PCSC/UnitaryTests/SCardReconnect.py Wed Nov 18 16:53:44 2009
@@ -23,12 +23,12 @@
import sys
hresult, hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to establish context: ' + SCardGetErrorMessage(hresult))
hresult, readers = SCardListReaders(hcontext, [])
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to list readers: ' + SCardGetErrorMessage(hresult))
print 'PC/SC Readers:', readers
print "Using reader:", readers[0]
@@ -36,8 +36,8 @@
# Connect in SCARD_SHARE_SHARED mode
hresult, hcard, dwActiveProtocol = SCardConnect(hcontext, readers[0],
SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardConnect: ' + SCardGetErrorMessage(hresult))
print "Press enter"
sys.stdin.read(1)
@@ -45,14 +45,14 @@
# Reconnect in SCARD_SHARE_DIRECT mode
hresult, dwActiveProtocol = SCardReconnect(hcard,
SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY, SCARD_LEAVE_CARD)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardReconnect: ' +
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardReconnect: ' +
SCardGetErrorMessage(hresult))
hresult = SCardDisconnect(hcard, SCARD_RESET_CARD)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to SCardDisconnect: ' + SCardGetErrorMessage(hresult))
hresult = SCardReleaseContext(hcontext)
-if hresult!=SCARD_S_SUCCESS:
- raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
+if hresult != SCARD_S_SUCCESS:
+ raise Exception('Failed to release context: ' + SCardGetErrorMessage(hresult))
Modified: trunk/PCSC/UnitaryTests/control_get_firmware.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/control_get_firmware.py?rev=4560&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/control_get_firmware.py (original)
+++ trunk/PCSC/UnitaryTests/control_get_firmware.py Wed Nov 18 16:53:44 2009
@@ -25,9 +25,9 @@
cardConnection = reader.createConnection()
cardConnection.connect(mode=SCARD_SHARE_DIRECT)
- get_firmware = [ 0x02 ]
+ get_firmware = [0x02]
IOCTL_SMARTCARD_VENDOR_IFD_EXCHANGE = SCARD_CTL_CODE(1)
- res = cardConnection.control(IOCTL_SMARTCARD_VENDOR_IFD_EXCHANGE, get_firmware)
+ res = cardConnection.control(IOCTL_SMARTCARD_VENDOR_IFD_EXCHANGE,
+ get_firmware)
print "Reader:", reader
print "Firmware:", "".join(map(chr, res))
-
Modified: trunk/PCSC/UnitaryTests/control_switch_interface.py
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/UnitaryTests/control_switch_interface.py?rev=4560&op=diff
==============================================================================
--- trunk/PCSC/UnitaryTests/control_switch_interface.py (original)
+++ trunk/PCSC/UnitaryTests/control_switch_interface.py Wed Nov 18 16:53:44 2009
@@ -21,16 +21,18 @@
from smartcard.pcsc.PCSCPart10 import *
from smartcard.util import toHexString
+
def switch_interface(interface):
for reader in readers():
cardConnection = reader.createConnection()
cardConnection.connect(mode=SCARD_SHARE_DIRECT)
- switch_interface = [ 0x52, 0xF8, 0x04, 0x01, 0x00, interface ]
+ switch_interface = [0x52, 0xF8, 0x04, 0x01, 0x00, interface]
IOCTL_SMARTCARD_VENDOR_IFD_EXCHANGE = SCARD_CTL_CODE(1)
print "Reader:", reader,
try:
- res = cardConnection.control(IOCTL_SMARTCARD_VENDOR_IFD_EXCHANGE, switch_interface)
+ res = cardConnection.control(IOCTL_SMARTCARD_VENDOR_IFD_EXCHANGE,
+ switch_interface)
except:
print "FAILED"
else:
More information about the Pcsclite-cvs-commit
mailing list