[Pyscard-devel] SF.net SVN: pyscard:[477] trunk/pyscard/src/smartcard/test/framework

[<lu...@us...>]

Revision: 477
          http://pyscard.svn.sourceforge.net/pyscard/?rev=477&view=rev
Author:   ludov
Date:     2010-06-09 15:52:06 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
make pep8 happy

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/test/framework/testcase_utils.py
    trunk/pyscard/src/smartcard/test/framework/testsuite_framework.py

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_utils.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_utils.py	2010-06-09 15:50:13 UTC (rev 476)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_utils.py	2010-06-09 15:52:06 UTC (rev 477)
@@ -32,80 +32,75 @@
 
 from smartcard.util import *
 
+
 class testcase_utils(unittest.TestCase):
     """Test smartcard.utils."""
 
-
     def testcase_asciitostring(self):
         """tests ASCIIToString"""
-        self.assertEquals( toASCIIString( [0x4E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0x20, 0x31, 0x30, 0x31] ), "Number 101" )
+        self.assertEquals(toASCIIString([0x4E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0x20, 0x31, 0x30, 0x31]), "Number 101")
 
-
     def testcase_bytesto338(self):
         """tests toGSM3_38Bytes"""
-        self.assertEquals( toGSM3_38Bytes( "@\xF9Pascal" ), [ 0x00, 0x06, 0x50, 0x61, 0x73, 0x63, 0x61, 0x6C ] )
+        self.assertEquals(toGSM3_38Bytes("@\xF9Pascal"), [0x00, 0x06, 0x50, 0x61, 0x73, 0x63, 0x61, 0x6C])
 
-
     def testcase_padd(self):
         """tests padd"""
-        self.assertEquals( [0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF],
-                           padd( [0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3], 16 ) )
+        self.assertEquals([0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF],
+                           padd([0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3], 16))
 
-        self.assertEquals( [0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3 ],
-                           padd( [0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3], 9 ) )
+        self.assertEquals([0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3],
+                           padd([0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3], 9))
 
-        self.assertEquals( [0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3 ],
-                           padd( [0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3], 8 ) )
+        self.assertEquals([0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3],
+                           padd([0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3], 8))
 
-        self.assertEquals( [0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3, 0xFF ],
-                           padd( [0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3 ], 10 ) )
+        self.assertEquals([0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3, 0xFF],
+                           padd([0x3B, 0x65, 0, 0, 0x9C, 0x11, 1, 1, 3], 10))
 
-
     def testcase_toasciibytes(self):
         """tests toASCIIBytes"""
-        self.assertEquals( [0x4E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0x20, 0x31, 0x30, 0x31],
-                           toASCIIBytes( "Number 101" ) )
+        self.assertEquals([0x4E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0x20, 0x31, 0x30, 0x31],
+                           toASCIIBytes("Number 101"))
 
-        self.assertEquals( toASCIIString( toASCIIBytes( "Number 101" ) ), "Number 101" )
+        self.assertEquals(toASCIIString(toASCIIBytes("Number 101")), "Number 101")
 
-
     def testcase_tobytestring(self):
         """tests toByteString"""
-        self.assertEquals( [59, 101, 0, 0, 156, 17, 1, 1, 3], toBytes("3B 65 00 00 9C 11 01 01 03") )
-        self.assertEquals( [59, 101, 0, 0, 156, 17, 1, 1, 3], toBytes("3B6500009C11010103") )
-        self.assertEquals( [59, 101, 0, 0, 156, 17, 1, 1, 3], toBytes("3B65 0000 9C11 010103") )
-        self.assertEquals( [59, 101, 0, 0, 156, 17, 1, 1, 3], toBytes("3B65 \t\t0000 \t9C11 \t0101\t03   \t\n") )
+        self.assertEquals([59, 101, 0, 0, 156, 17, 1, 1, 3], toBytes("3B 65 00 00 9C 11 01 01 03"))
+        self.assertEquals([59, 101, 0, 0, 156, 17, 1, 1, 3], toBytes("3B6500009C11010103"))
+        self.assertEquals([59, 101, 0, 0, 156, 17, 1, 1, 3], toBytes("3B65 0000 9C11 010103"))
+        self.assertEquals([59, 101, 0, 0, 156, 17, 1, 1, 3], toBytes("3B65 \t\t0000 \t9C11 \t0101\t03   \t\n"))
 
-
     def testcase_tohexstring(self):
         """tests toHexString"""
-        self.assertEquals( "3B 65 00 00 9C 11 01 01 03", toHexString([59, 101, 0, 0, 156, 17, 1, 1, 3]) )
+        self.assertEquals("3B 65 00 00 9C 11 01 01 03", toHexString([59, 101, 0, 0, 156, 17, 1, 1, 3]))
 
-        bytes = [ 0x3B, 0x65, 0x00, 0x00, 0x9C, 0x11, 0x01, 0x01, 0x03 ]
-        self.assertEquals( "3B, 65, 00, 00, 9C, 11, 01, 01, 03", toHexString( bytes, COMMA ) )
-        self.assertEquals( "3B6500009C11010103", toHexString( bytes, PACK ) )
-        self.assertEquals( "0x3B 0x65 0x00 0x00 0x9C 0x11 0x01 0x01 0x03", toHexString( bytes, HEX ) )
-        self.assertEquals( "0x3B, 0x65, 0x00, 0x00, 0x9C, 0x11, 0x01, 0x01, 0x03", toHexString( bytes, HEX | COMMA ) )
-        self.assertEquals( "0X3B 0X65 0X00 0X00 0X9C 0X11 0X01 0X01 0X03", toHexString( bytes, HEX | UPPERCASE ) )
-        self.assertEquals( "0X3B, 0X65, 0X00, 0X00, 0X9C, 0X11, 0X01, 0X01, 0X03", toHexString( bytes, HEX | UPPERCASE | COMMA) )
+        bytes = [0x3B, 0x65, 0x00, 0x00, 0x9C, 0x11, 0x01, 0x01, 0x03]
+        self.assertEquals("3B, 65, 00, 00, 9C, 11, 01, 01, 03", toHexString(bytes, COMMA))
+        self.assertEquals("3B6500009C11010103", toHexString(bytes, PACK))
+        self.assertEquals("0x3B 0x65 0x00 0x00 0x9C 0x11 0x01 0x01 0x03", toHexString(bytes, HEX))
+        self.assertEquals("0x3B, 0x65, 0x00, 0x00, 0x9C, 0x11, 0x01, 0x01, 0x03", toHexString(bytes, HEX | COMMA))
+        self.assertEquals("0X3B 0X65 0X00 0X00 0X9C 0X11 0X01 0X01 0X03", toHexString(bytes, HEX | UPPERCASE))
+        self.assertEquals("0X3B, 0X65, 0X00, 0X00, 0X9C, 0X11, 0X01, 0X01, 0X03", toHexString(bytes, HEX | UPPERCASE | COMMA))
 
         bytes = [59, 101, 0, 0, 156, 17, 1, 1, 3]
-        self.assertEquals( "3B, 65, 00, 00, 9C, 11, 01, 01, 03", toHexString( bytes, COMMA ) )
-        self.assertEquals( "3B6500009C11010103", toHexString( bytes, PACK ) )
-        self.assertEquals( "0x3B 0x65 0x00 0x00 0x9C 0x11 0x01 0x01 0x03", toHexString( bytes, HEX ) )
-        self.assertEquals( "0x3B, 0x65, 0x00, 0x00, 0x9C, 0x11, 0x01, 0x01, 0x03", toHexString( bytes, HEX | COMMA ) )
-        self.assertEquals( "0X3B 0X65 0X00 0X00 0X9C 0X11 0X01 0X01 0X03", toHexString( bytes, HEX | UPPERCASE ) )
-        self.assertEquals( "0X3B, 0X65, 0X00, 0X00, 0X9C, 0X11, 0X01, 0X01, 0X03", toHexString( bytes, HEX | UPPERCASE | COMMA) )
+        self.assertEquals("3B, 65, 00, 00, 9C, 11, 01, 01, 03", toHexString(bytes, COMMA))
+        self.assertEquals("3B6500009C11010103", toHexString(bytes, PACK))
+        self.assertEquals("0x3B 0x65 0x00 0x00 0x9C 0x11 0x01 0x01 0x03", toHexString(bytes, HEX))
+        self.assertEquals("0x3B, 0x65, 0x00, 0x00, 0x9C, 0x11, 0x01, 0x01, 0x03", toHexString(bytes, HEX | COMMA))
+        self.assertEquals("0X3B 0X65 0X00 0X00 0X9C 0X11 0X01 0X01 0X03", toHexString(bytes, HEX | UPPERCASE))
+        self.assertEquals("0X3B, 0X65, 0X00, 0X00, 0X9C, 0X11, 0X01, 0X01, 0X03", toHexString(bytes, HEX | UPPERCASE | COMMA))
 
     def testcase_tohexstring_empty(self):
         """tests toHexString"""
-        self.assertEquals( "", toHexString() )
-        self.assertEquals( "", toHexString([]) )
+        self.assertEquals("", toHexString())
+        self.assertEquals("", toHexString([]))
 
     def testcase_tohexstring_nobytes(self):
         """tests toHexString"""
-        self.assertRaises( TypeError, toHexString, 'bad input' )
-        self.assertRaises( TypeError, toHexString, ['bad', 'input'] )
+        self.assertRaises(TypeError, toHexString, 'bad input')
+        self.assertRaises(TypeError, toHexString, ['bad', 'input'])
 
 
 def suite():

Modified: trunk/pyscard/src/smartcard/test/framework/testsuite_framework.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testsuite_framework.py	2010-06-09 15:50:13 UTC (rev 476)
+++ trunk/pyscard/src/smartcard/test/framework/testsuite_framework.py	2010-06-09 15:52:06 UTC (rev 477)
@@ -30,6 +30,7 @@
 sys.path += ['..']
 import configcheck
 
+
 def suite():
     modules_to_test = (
         'testcase_ATR',
@@ -51,7 +52,7 @@
         )
     testsuite_framework = unittest.TestSuite()
     for module in map(__import__, modules_to_test):
-        testsuite_framework.addTest( unittest.findTestCases(module) )
+        testsuite_framework.addTest(unittest.findTestCases(module))
     return testsuite_framework
 
 if __name__ == '__main__':


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.