Menu
▾
▴
[Pyscard-devel] SF.net SVN: pyscard:[483] trunk/pyscard/src/smartcard/test/scard
|
From: <lu...@us...> - 2010-06-09 16:39:50
|
Revision: 483
http://pyscard.svn.sourceforge.net/pyscard/?rev=483&view=rev
Author: ludov
Date: 2010-06-09 16:39:44 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
make pep8 happy
Modified Paths:
--------------
trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py
trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py 2010-06-09 16:35:51 UTC (rev 482)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py 2010-06-09 16:39:44 UTC (rev 483)
@@ -45,45 +45,44 @@
class testcase_getATR(unittest.TestCase):
"""Test scard API for ATR retrieval"""
+
def setUp(self):
- hresult, self.hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
+ hresult, self.hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
self.assertEquals(hresult, 0)
- hresult, self.readers = SCardListReaders( self.hcontext, [] )
+ hresult, self.readers = SCardListReaders(self.hcontext, [])
self.assertEquals(hresult, 0)
def tearDown(self):
- hresult = SCardReleaseContext( self.hcontext )
+ hresult = SCardReleaseContext(self.hcontext)
self.assertEquals(hresult, 0)
-
def _getATR(self, r):
- if r<len(expectedATRs) and []!=expectedATRs[r]:
+ if r < len(expectedATRs) and [] != expectedATRs[r]:
hresult, hcard, dwActiveProtocol = SCardConnect(
self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
self.assertEquals(hresult, 0)
try:
- hresult, reader, state, protocol, atr = SCardStatus( hcard )
+ hresult, reader, state, protocol, atr = SCardStatus(hcard)
self.assertEquals(hresult, 0)
- self.assertEquals( reader, expectedReaders[r] )
- self.assertEquals( atr, expectedATRs[r] )
+ self.assertEquals(reader, expectedReaders[r])
+ self.assertEquals(atr, expectedATRs[r])
finally:
- hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD )
+ hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD)
self.assertEquals(hresult, 0)
-
def test_getATR0(self):
- testcase_getATR._getATR(self,0)
+ testcase_getATR._getATR(self, 0)
def test_getATR1(self):
- testcase_getATR._getATR(self,1)
+ testcase_getATR._getATR(self, 1)
def test_getATR2(self):
- testcase_getATR._getATR(self,2)
+ testcase_getATR._getATR(self, 2)
def test_getATR3(self):
- testcase_getATR._getATR(self,3)
+ testcase_getATR._getATR(self, 3)
def suite():
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py 2010-06-09 16:35:51 UTC (rev 482)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py 2010-06-09 16:39:44 UTC (rev 483)
@@ -46,55 +46,55 @@
class testcase_getAttrib(unittest.TestCase):
"""Test scard API for SCardGetAttrib"""
+
def setUp(self):
- hresult, self.hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
+ hresult, self.hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
self.assertEquals(hresult, 0)
- hresult, self.readers = SCardListReaders( self.hcontext, [] )
+ hresult, self.readers = SCardListReaders(self.hcontext, [])
self.assertEquals(hresult, 0)
def tearDown(self):
- hresult = SCardReleaseContext( self.hcontext )
+ hresult = SCardReleaseContext(self.hcontext)
self.assertEquals(hresult, 0)
-
def _getAttrib(self, r):
- if r<len(expectedATRs) and []!=expectedATRs[r]:
+ if r < len(expectedATRs) and [] != expectedATRs[r]:
hresult, hcard, dwActiveProtocol = SCardConnect(
self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
self.assertEquals(hresult, 0)
try:
- hresult, reader, state, protocol, atr = SCardStatus( hcard )
+ hresult, reader, state, protocol, atr = SCardStatus(hcard)
self.assertEquals(hresult, 0)
- self.assertEquals( reader, expectedReaders[r] )
- self.assertEquals( atr, expectedATRs[r] )
+ self.assertEquals(reader, expectedReaders[r])
+ self.assertEquals(atr, expectedATRs[r])
- if scard.__dict__.has_key( 'SCARD_ATTR_ATR_STRING' ):
- hresult, attrib = SCardGetAttrib( hcard, SCARD_ATTR_ATR_STRING )
+ if scard.__dict__.has_key('SCARD_ATTR_ATR_STRING'):
+ hresult, attrib = SCardGetAttrib(hcard, SCARD_ATTR_ATR_STRING)
self.assertEquals(hresult, 0)
- self.assertEquals( expectedATRs[r], attrib )
+ self.assertEquals(expectedATRs[r], attrib)
- if 'winscard'==resourceManager:
- hresult, attrib = SCardGetAttrib( hcard, SCARD_ATTR_DEVICE_SYSTEM_NAME_A )
+ if 'winscard' == resourceManager:
+ hresult, attrib = SCardGetAttrib(hcard, SCARD_ATTR_DEVICE_SYSTEM_NAME_A)
self.assertEquals(hresult, 0)
- trimmedAttrib=attrib[:-1]
- self.assertEquals( expectedReaders[r], apply( struct.pack, [ '<' + 'B' * len(trimmedAttrib)] + trimmedAttrib ) )
+ trimmedAttrib = attrib[:-1]
+ self.assertEquals(expectedReaders[r], apply(struct.pack, ['<' + 'B' * len(trimmedAttrib)] + trimmedAttrib))
finally:
- hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD )
+ hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD)
self.assertEquals(hresult, 0)
def test_getATR0(self):
- testcase_getAttrib._getAttrib(self,0)
+ testcase_getAttrib._getAttrib(self, 0)
def test_getATR1(self):
- testcase_getAttrib._getAttrib(self,1)
+ testcase_getAttrib._getAttrib(self, 1)
def test_getATR3(self):
- testcase_getAttrib._getAttrib(self,2)
+ testcase_getAttrib._getAttrib(self, 2)
def test_getATR4(self):
- testcase_getAttrib._getAttrib(self,3)
+ testcase_getAttrib._getAttrib(self, 3)
def suite():
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
