pyscard-devel Mailing List for pyscard (Page 17)

Brought to you by: jdaussel, ludov

pyscard-devel — For pyscard developers

You can subscribe to this list here.

2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2008	Jan (10)	Feb (10)	Mar	Apr (1)	May	Jun	Jul	Aug (17)	Sep (9)	Oct (10)	Nov (2)	Dec (5)
2009	Jan (17)	Feb (8)	Mar (10)	Apr (1)	May	Jun (11)	Jul (18)	Aug	Sep	Oct (10)	Nov (40)	Dec (4)
2010	Jan (2)	Feb (5)	Mar (13)	Apr (14)	May (27)	Jun (86)	Jul (1)	Aug (12)	Sep	Oct (2)	Nov (3)	Dec (5)
2011	Jan	Feb (2)	Mar	Apr (3)	May	Jun	Jul (11)	Aug (1)	Sep (3)	Oct (65)	Nov	Dec (1)
2012	Jan (1)	Feb (4)	Mar (6)	Apr (6)	May	Jun (4)	Jul	Aug	Sep (12)	Oct (3)	Nov (1)	Dec
2013	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (3)	Nov	Dec (1)
2014	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep (4)	Oct (1)	Nov (24)	Dec (10)
2015	Jan (1)	Feb (10)	Mar	Apr	May (1)	Jun (15)	Jul (4)	Aug (2)	Sep (1)	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 15 16 17 18 19 .. 23 > >> (Page 17 of 23)

[Pyscard-devel] SF.net SVN: pyscard:[339] trunk/pyscard/src/setup.py

From: <lu...@us...> - 2009-11-22 14:38:27

Revision: 339
          http://pyscard.svn.sourceforge.net/pyscard/?rev=339&view=rev
Author:   ludov
Date:     2009-11-22 14:38:20 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
pep8: W291 trailing whitespace 
-- This line, and those below, will be ignored--

M    src/setup.py

Modified Paths:
--------------
    trunk/pyscard/src/setup.py

Modified: trunk/pyscard/src/setup.py
===================================================================
--- trunk/pyscard/src/setup.py	2009-11-22 14:34:40 UTC (rev 338)
+++ trunk/pyscard/src/setup.py	2009-11-22 14:38:20 UTC (rev 339)
@@ -73,7 +73,7 @@
 #
 # Mac OS X Leopard has python 2.5 preinstalled
 # get_platform() returns a string similar to 'macosx-10.5-i386'
-# 
+#
 elif 'macosx-10.' in get_platform():
     platform__cc_defines=[ ('PCSCLITE', '1'), ('__APPLE__','1'), ('__LEOPARD__','1')]
     platform_swig_opts=[ '-DPCSCLITE', '-D__APPLE__', '-D__LEOPARD__' ]
@@ -139,7 +139,7 @@
         if self.swig_cpp:
             swig_cmd.append("-c++")
 
-        swig_cmd += platform_swig_opts 
+        swig_cmd += platform_swig_opts
 
         for source in swig_sources:
             target = swig_targets[source]
@@ -147,7 +147,7 @@
             self.spawn(swig_cmd + ["-o", target, source])
 
         return new_sources
-    
+
     build_ext.swig_sources = swig_sources
 
 kw = {'name':"pyscard",
@@ -216,7 +216,7 @@
 # copy manually package_data
 if sys.version_info < (2,4):
     from distutils.util import convert_path
-    from glob import glob 
+    from glob import glob
     if "install" in sys.argv:
         targetdir = pyscard_dist.command_obj['install'].install_purelib
         package_data=kw['package_data']
@@ -227,6 +227,6 @@
                 files.extend( [fn for fn in filelist if fn not in files] )
         for file in files:
             newdir = os.path.dirname( file )
-            dir_util.mkpath( os.path.join( targetdir, newdir ) ) 
+            dir_util.mkpath( os.path.join( targetdir, newdir ) )
             file_util.copy_file( file, os.path.join( targetdir, file ) )
 


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

[Pyscard-devel] SF.net SVN: pyscard:[338] trunk/pyscard/src/setup.py

From: <lu...@us...> - 2009-11-22 14:35:08

Revision: 338
          http://pyscard.svn.sourceforge.net/pyscard/?rev=338&view=rev
Author:   ludov
Date:     2009-11-22 14:34:40 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
pep8: E401 multiple imports on one line

Modified Paths:
--------------
    trunk/pyscard/src/setup.py

Modified: trunk/pyscard/src/setup.py
===================================================================
--- trunk/pyscard/src/setup.py	2009-11-22 14:33:02 UTC (rev 337)
+++ trunk/pyscard/src/setup.py	2009-11-22 14:34:40 UTC (rev 338)
@@ -27,7 +27,9 @@
 from distutils.core import Extension
 from distutils.util import get_platform
 from distutils.command.build_ext import build_ext
-import glob, os, sys
+import glob
+import os
+import sys
 
 if sys.version[0:1] == '1':
     raise RuntimeError, ("pyscard requires Python 2.x to build.")


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

[Pyscard-devel] SF.net SVN: pyscard:[337] trunk/pyscard/tools/commands/build-doc.py

From: <lu...@us...> - 2009-11-22 14:33:28

Revision: 337
          http://pyscard.svn.sourceforge.net/pyscard/?rev=337&view=rev
Author:   ludov
Date:     2009-11-22 14:33:02 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
pep8: E302 expected 2 blank lines, found 0

Modified Paths:
--------------
    trunk/pyscard/tools/commands/build-doc.py

Modified: trunk/pyscard/tools/commands/build-doc.py
===================================================================
--- trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:32:08 UTC (rev 336)
+++ trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:33:02 UTC (rev 337)
@@ -62,6 +62,8 @@
 searchterm = '>pyscard</th>'
 placeholder = re.compile( searchterm )
 sourceforgelogo = '<a href="http://sourceforge.net/projects/pyscard"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=196342&amp;type=11" width="120" height="30" alt="Get pyscard at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>'
+
+
 # looks for placeholder and insert sourceforge logo if found
 def insertSourceForgeLogo( file ):
     try:


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

[Pyscard-devel] SF.net SVN: pyscard:[336] trunk/pyscard/tools/commands/build-doc.py

From: <lu...@us...> - 2009-11-22 14:32:15

Revision: 336
          http://pyscard.svn.sourceforge.net/pyscard/?rev=336&view=rev
Author:   ludov
Date:     2009-11-22 14:32:08 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
E111 indentation is not a multiple of four

Modified Paths:
--------------
    trunk/pyscard/tools/commands/build-doc.py

Modified: trunk/pyscard/tools/commands/build-doc.py
===================================================================
--- trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:31:19 UTC (rev 335)
+++ trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:32:08 UTC (rev 336)
@@ -69,9 +69,9 @@
         data = fileToSearch.read()
         data = data.split('\n')
         for line in data:
-          bFound = placeholder.search( line )
-          if ( bFound ):
-             break
+            bFound = placeholder.search( line )
+            if ( bFound ):
+                break
         fileToSearch.close()
     except IOError:
         print "No such file:", file


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

[Pyscard-devel] SF.net SVN: pyscard:[335] trunk/pyscard/tools/commands/build-doc.py

From: <lu...@us...> - 2009-11-22 14:31:25

Revision: 335
          http://pyscard.svn.sourceforge.net/pyscard/?rev=335&view=rev
Author:   ludov
Date:     2009-11-22 14:31:19 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
pep8: W291 trailing whitespace

Modified Paths:
--------------
    trunk/pyscard/tools/commands/build-doc.py

Modified: trunk/pyscard/tools/commands/build-doc.py
===================================================================
--- trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:30:39 UTC (rev 334)
+++ trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:31:19 UTC (rev 335)
@@ -83,7 +83,7 @@
             if placeholder.search( line ):
                 fileToReplace.write( sourceforgelogo )
         fileToReplace.close()
-    
+
 # build documentation package for pyscard
 if os.path.exists( smartcardpackagedir ):
     os.makedirs( targetepydocdir )


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

[Pyscard-devel] SF.net SVN: pyscard:[334] trunk/pyscard/tools/commands/build-doc.py

From: <lu...@us...> - 2009-11-22 14:30:50

Revision: 334
          http://pyscard.svn.sourceforge.net/pyscard/?rev=334&view=rev
Author:   ludov
Date:     2009-11-22 14:30:39 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
pep8: E225 missing whitespace around operator

Modified Paths:
--------------
    trunk/pyscard/tools/commands/build-doc.py

Modified: trunk/pyscard/tools/commands/build-doc.py
===================================================================
--- trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:28:15 UTC (rev 333)
+++ trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:30:39 UTC (rev 334)
@@ -87,14 +87,14 @@
 # build documentation package for pyscard
 if os.path.exists( smartcardpackagedir ):
     os.makedirs( targetepydocdir )
-    sys.argv=[ '--html', '--output', targetepydocdir, '--config='+configfile ]
+    sys.argv = [ '--html', '--output', targetepydocdir, '--config=' + configfile ]
     cli()
     dir_util.copy_tree( sourcedocdir, targetdocdir, preserve_mode=0, verbose=1 )
     dir_util.copy_tree( sourceexampledir, os.path.join( targetdocdir, 'Examples' ), preserve_mode=0, verbose=1 )
 
     # remove subversion directories (*//.svn)
     files = os.walk( os.path.join( targetdocdir ) )
-    dirstodelete=[]
+    dirstodelete = []
     for dirpath, dn, fn in files:
         if '.svn' in dirpath[-4:] and dirpath not in dirstodelete: dirstodelete.append( dirpath )
     for dir in dirstodelete:
@@ -102,11 +102,11 @@
 
     # insert sourceforge pyscard logo in html pages
     files = os.walk( os.path.join( targetdocdir ) )
-    htmlfiles=[]
+    htmlfiles = []
     for dirpath, dn, filenames in files:
         for filename in filenames:
             root, ext = os.path.splitext( filename )
-            if '.html'==ext:
+            if '.html' == ext:
                 htmlfiles.append( os.path.join( dirpath, filename ) )
     for file in htmlfiles:
         insertSourceForgeLogo( file )


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

[Pyscard-devel] SF.net SVN: pyscard:[333] trunk/pyscard/tools/commands

From: <lu...@us...> - 2009-11-22 14:28:41

Revision: 333
          http://pyscard.svn.sourceforge.net/pyscard/?rev=333&view=rev
Author:   ludov
Date:     2009-11-22 14:28:15 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
pep8: W391 blank line at end of file

Modified Paths:
--------------
    trunk/pyscard/tools/commands/build-doc.py
    trunk/pyscard/tools/commands/uninstall.py

Modified: trunk/pyscard/tools/commands/build-doc.py
===================================================================
--- trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:25:23 UTC (rev 332)
+++ trunk/pyscard/tools/commands/build-doc.py	2009-11-22 14:28:15 UTC (rev 333)
@@ -115,4 +115,3 @@
 
 # zip documentation
 make_archive( os.path.join( targetgenerateddir, 'pyscard-doc'), 'zip', root_dir=targetgenerateddir, base_dir='doc' )
-

Modified: trunk/pyscard/tools/commands/uninstall.py
===================================================================
--- trunk/pyscard/tools/commands/uninstall.py	2009-11-22 14:25:23 UTC (rev 332)
+++ trunk/pyscard/tools/commands/uninstall.py	2009-11-22 14:28:15 UTC (rev 333)
@@ -44,4 +44,3 @@
 smartcardpackagedir = os.path.join( get_python_lib(), 'smartcard' )
 if os.path.exists( smartcardpackagedir ):
     _rmdir( smartcardpackagedir )
-


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

[Pyscard-devel] SF.net SVN: pyscard:[332] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-11-22 14:25:30

Revision: 332
          http://pyscard.svn.sourceforge.net/pyscard/?rev=332&view=rev
Author:   ludov
Date:     2009-11-22 14:25:23 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
parseATR.py:672:30: E251 no spaces around keyword / parameter equals

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-11-22 14:16:37 UTC (rev 331)
+++ trunk/contrib/parseATR/parseATR.py	2009-11-22 14:25:23 UTC (rev 332)
@@ -669,7 +669,7 @@
 
     return "\n".join([colorize(t) for t in text])
 
-def match_atr(atr, atr_file = "smartcard_list.txt"):
+def match_atr(atr, atr_file="smartcard_list.txt"):
     """ try to find card description for a given ATR """
     card = []
     atr = toHexString(normalize(atr))


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

[Pyscard-devel] SF.net SVN: pyscard:[331] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-11-22 14:16:48

Revision: 331
          http://pyscard.svn.sourceforge.net/pyscard/?rev=331&view=rev
Author:   ludov
Date:     2009-11-22 14:16:37 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
catch an explicite IndexError exception instead of all

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-11-22 14:15:15 UTC (rev 330)
+++ trunk/contrib/parseATR/parseATR.py	2009-11-22 14:16:37 UTC (rev 331)
@@ -479,7 +479,7 @@
         if len == 1:
             try:
                 sm = historical_bytes[0]
-            except:
+            except IndexError:
                 text.append("Error in the ATR: expecting 1 byte and got 0\n")
             else:
                 text.append("      Selection methods: %d\n" % sm)


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

[Pyscard-devel] SF.net SVN: pyscard:[330] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-11-22 14:15:22

Revision: 330
          http://pyscard.svn.sourceforge.net/pyscard/?rev=330&view=rev
Author:   ludov
Date:     2009-11-22 14:15:15 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
match_atr(): accept an atr_file argument. Default value is
"smartcard_list.txt"

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-11-16 10:51:53 UTC (rev 329)
+++ trunk/contrib/parseATR/parseATR.py	2009-11-22 14:15:15 UTC (rev 330)
@@ -669,11 +669,11 @@
 
     return "\n".join([colorize(t) for t in text])
 
-def match_atr(atr):
+def match_atr(atr, atr_file = "smartcard_list.txt"):
     """ try to find card description for a given ATR """
     card = []
     atr = toHexString(normalize(atr))
-    file = open("smartcard_list.txt")
+    file = open(atr_file)
     for line in file:
         if line.startswith("#"):
             continue


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

[Pyscard-devel] SF.net SVN: pyscard:[329] trunk/pyscard/src/smartcard

From: <lu...@us...> - 2009-11-16 10:52:09

Revision: 329
          http://pyscard.svn.sourceforge.net/pyscard/?rev=329&view=rev
Author:   ludov
Date:     2009-11-16 10:51:53 +0000 (Mon, 16 Nov 2009)

Log Message:
-----------
pep8: W391 blank line at end of file

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/ATR.py
    trunk/pyscard/src/smartcard/AbstractCardRequest.py
    trunk/pyscard/src/smartcard/Card.py
    trunk/pyscard/src/smartcard/CardConnection.py
    trunk/pyscard/src/smartcard/CardConnectionDecorator.py
    trunk/pyscard/src/smartcard/CardConnectionEvent.py
    trunk/pyscard/src/smartcard/CardConnectionObserver.py
    trunk/pyscard/src/smartcard/CardMonitoring.py
    trunk/pyscard/src/smartcard/CardNames.py
    trunk/pyscard/src/smartcard/CardRequest.py
    trunk/pyscard/src/smartcard/CardService.py
    trunk/pyscard/src/smartcard/CardType.py
    trunk/pyscard/src/smartcard/ClassLoader.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_ATR.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_CardConnectionDecorator.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_ConsoleConnectionTracer.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_CustomCardType.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_CustomErrorChecker.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_ErrorChecking.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_ExclusiveCardConnection.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorCards.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorCardsAndTransmit.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorReaders.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_TransmitCardObserver.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_apduTracerInterpreter.py
    trunk/pyscard/src/smartcard/Examples/framework/sample_toHexString.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_getAttrib.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_getStatusChange.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_listCards.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_listInterfaces.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_locateCards.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_readerGroups.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_readers.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_selectDFTelecom.py
    trunk/pyscard/src/smartcard/Examples/scard-api/sample_transaction.py
    trunk/pyscard/src/smartcard/Examples/simple/getATR.py
    trunk/pyscard/src/smartcard/Examples/simple/selectDF_TELECOM.py
    trunk/pyscard/src/smartcard/Examples/wx/apdumanager/apdumanager.py
    trunk/pyscard/src/smartcard/Examples/wx/cardmonitor/cardmonitor.py
    trunk/pyscard/src/smartcard/Examples/wx/readerviewer/readerviewer.py
    trunk/pyscard/src/smartcard/Exceptions.py
    trunk/pyscard/src/smartcard/PassThruCardService.py
    trunk/pyscard/src/smartcard/ReaderMonitoring.py
    trunk/pyscard/src/smartcard/Session.py
    trunk/pyscard/src/smartcard/System.py
    trunk/pyscard/src/smartcard/__init__.py
    trunk/pyscard/src/smartcard/pcsc/PCSCCardRequest.py
    trunk/pyscard/src/smartcard/pcsc/PCSCContext.py
    trunk/pyscard/src/smartcard/pcsc/PCSCExceptions.py
    trunk/pyscard/src/smartcard/pcsc/PCSCReader.py
    trunk/pyscard/src/smartcard/pcsc/PCSCReaderGroups.py
    trunk/pyscard/src/smartcard/reader/Reader.py
    trunk/pyscard/src/smartcard/reader/ReaderFactory.py
    trunk/pyscard/src/smartcard/reader/ReaderGroups.py
    trunk/pyscard/src/smartcard/reader/__init__.py
    trunk/pyscard/src/smartcard/sw/ErrorChecker.py
    trunk/pyscard/src/smartcard/sw/ErrorCheckingChain.py
    trunk/pyscard/src/smartcard/sw/ISO7816_4ErrorChecker.py
    trunk/pyscard/src/smartcard/sw/ISO7816_4_SW1ErrorChecker.py
    trunk/pyscard/src/smartcard/sw/ISO7816_8ErrorChecker.py
    trunk/pyscard/src/smartcard/sw/ISO7816_9ErrorChecker.py
    trunk/pyscard/src/smartcard/sw/SWExceptions.py
    trunk/pyscard/src/smartcard/sw/__init__.py
    trunk/pyscard/src/smartcard/sw/op21_ErrorChecker.py
    trunk/pyscard/src/smartcard/test/framework/testcase_ATR.py
    trunk/pyscard/src/smartcard/test/framework/testcase_CAtr.py
    trunk/pyscard/src/smartcard/test/framework/testcase_Card.py
    trunk/pyscard/src/smartcard/test/framework/testcase_CardConnection.py
    trunk/pyscard/src/smartcard/test/framework/testcase_CardMonitor.py
    trunk/pyscard/src/smartcard/test/framework/testcase_CardRequest.py
    trunk/pyscard/src/smartcard/test/framework/testcase_CardService.py
    trunk/pyscard/src/smartcard/test/framework/testcase_CardType.py
    trunk/pyscard/src/smartcard/test/framework/testcase_ErrorChecking.py
    trunk/pyscard/src/smartcard/test/framework/testcase_ExclusiveCardConnection.py
    trunk/pyscard/src/smartcard/test/framework/testcase_readergroups.py
    trunk/pyscard/src/smartcard/test/framework/testcase_readermonitor.py
    trunk/pyscard/src/smartcard/test/framework/testcase_readermonitorstress.py
    trunk/pyscard/src/smartcard/test/framework/testcase_readers.py
    trunk/pyscard/src/smartcard/test/framework/testsuite_framework.py
    trunk/pyscard/src/smartcard/test/frameworkpcsc/testcase_pcscreadergroups.py
    trunk/pyscard/src/smartcard/test/frameworkpcsc/testsuite_frameworkpcsc.py
    trunk/pyscard/src/smartcard/test/manual/testcase_manualCardRequest.py
    trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py
    trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py
    trunk/pyscard/src/smartcard/test/scard/testcase_geterrormessage.py
    trunk/pyscard/src/smartcard/test/scard/testcase_listcards.py
    trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py
    trunk/pyscard/src/smartcard/test/scard/testcase_readergroups.py
    trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py
    trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py
    trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py
    trunk/pyscard/src/smartcard/ulist.py
    trunk/pyscard/src/smartcard/wx/APDUTracerPanel.py
    trunk/pyscard/src/smartcard/wx/CardAndReaderTreePanel.py
    trunk/pyscard/src/smartcard/wx/ReaderToolbar.py
    trunk/pyscard/src/smartcard/wx/SimpleSCardAppEventObserver.py
    trunk/pyscard/src/smartcard/wx/SimpleSCardAppFrame.py
    trunk/pyscard/src/smartcard/wx/__init__.py

Modified: trunk/pyscard/src/smartcard/ATR.py
===================================================================
--- trunk/pyscard/src/smartcard/ATR.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/ATR.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -286,4 +286,3 @@
         print a
         a.dump()
         print reduce( lambda a, b: a+"%-0.2X " % ((b+256)%256), a.getHistoricalBytes(), '' )
-

Modified: trunk/pyscard/src/smartcard/AbstractCardRequest.py
===================================================================
--- trunk/pyscard/src/smartcard/AbstractCardRequest.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/AbstractCardRequest.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -77,4 +77,3 @@
     def waitforcardevent( self ):
         """Wait for card insertion or removal."""
         pass
-

Modified: trunk/pyscard/src/smartcard/Card.py
===================================================================
--- trunk/pyscard/src/smartcard/Card.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Card.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -68,4 +68,3 @@
         else:
             #raise CardConnectionException( 'not a valid reader: ' + str(self.reader) )
             return None
-

Modified: trunk/pyscard/src/smartcard/CardConnection.py
===================================================================
--- trunk/pyscard/src/smartcard/CardConnection.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/CardConnection.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -164,4 +164,3 @@
 
         Subclasses must override this method for implementing control."""
         pass
-

Modified: trunk/pyscard/src/smartcard/CardConnectionDecorator.py
===================================================================
--- trunk/pyscard/src/smartcard/CardConnectionDecorator.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/CardConnectionDecorator.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -83,4 +83,3 @@
     def control( self, controlCode, bytes=[] ):
         """call inner component control"""
         return self.component.control( controlCode, bytes )
-

Modified: trunk/pyscard/src/smartcard/CardConnectionEvent.py
===================================================================
--- trunk/pyscard/src/smartcard/CardConnectionEvent.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/CardConnectionEvent.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -36,4 +36,3 @@
     def __init__( self, type, args=None):
         self.type=type
         self.args=args
-

Modified: trunk/pyscard/src/smartcard/CardConnectionObserver.py
===================================================================
--- trunk/pyscard/src/smartcard/CardConnectionObserver.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/CardConnectionObserver.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -61,4 +61,3 @@
                 print '<  [] ', "%-2X %-2X" % tuple(ccevent.args[-2:])
             else:
                 print '< ', toHexString(ccevent.args[0]), "%-2X %-2X" % tuple(ccevent.args[-2:])
-

Modified: trunk/pyscard/src/smartcard/CardMonitoring.py
===================================================================
--- trunk/pyscard/src/smartcard/CardMonitoring.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/CardMonitoring.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -242,4 +242,3 @@
     t2 = testthread(2)
     t1.start()
     t2.start()
-

Modified: trunk/pyscard/src/smartcard/CardNames.py
===================================================================
--- trunk/pyscard/src/smartcard/CardNames.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/CardNames.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -103,4 +103,3 @@
     cn.delete( "Palmera Protect V2" )
     print '---------'
     cn.dump()
-

Modified: trunk/pyscard/src/smartcard/CardRequest.py
===================================================================
--- trunk/pyscard/src/smartcard/CardRequest.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/CardRequest.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -75,4 +75,3 @@
     cs.connection.connect()
     print cs.connection.getReader(), toHexString(cs.connection.getATR())
     cs.connection.disconnect()
-

Modified: trunk/pyscard/src/smartcard/CardService.py
===================================================================
--- trunk/pyscard/src/smartcard/CardService.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/CardService.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -67,4 +67,3 @@
     data, sw1, sw2 = cs.connection.transmit( SELECT + DF_TELECOM )
     print "%X %X" % ( sw1, sw2 )
     cs.connection.disconnect()
-

Modified: trunk/pyscard/src/smartcard/CardType.py
===================================================================
--- trunk/pyscard/src/smartcard/CardType.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/CardType.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -104,4 +104,3 @@
     connection.connect()
     atrct=ATRCardType(  [0x3B, 0x16, 0x94, 0x20, 0x02, 0x01, 0x00, 0x00, 0x0D] )
     print atrct.matches( connection.getATR() )
-

Modified: trunk/pyscard/src/smartcard/ClassLoader.py
===================================================================
--- trunk/pyscard/src/smartcard/ClassLoader.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/ClassLoader.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -47,4 +47,3 @@
 
     # Return a reference to the class itself, not an instantiated object.
     return aClass
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_ATR.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_ATR.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_ATR.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -36,4 +36,3 @@
 print 'T0  supported: ', atr.isT0Supported()
 print 'T1  supported: ', atr.isT1Supported()
 print 'T15 supported: ', atr.isT15Supported()
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_CardConnectionDecorator.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_CardConnectionDecorator.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_CardConnectionDecorator.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -106,4 +106,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_ConsoleConnectionTracer.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_ConsoleConnectionTracer.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_ConsoleConnectionTracer.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -59,4 +59,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_CustomCardType.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_CustomCardType.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_CustomCardType.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -50,4 +50,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_CustomErrorChecker.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_CustomErrorChecker.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_CustomErrorChecker.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -85,4 +85,3 @@
     if 'win32'==sys.platform:
         print 'press Enter to continue'
         sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_ErrorChecking.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_ErrorChecking.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_ErrorChecking.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -86,4 +86,3 @@
     if 'win32'==sys.platform:
         print 'press Enter to continue'
         sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_ExclusiveCardConnection.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_ExclusiveCardConnection.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_ExclusiveCardConnection.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -71,4 +71,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorCards.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorCards.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorCards.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -63,4 +63,3 @@
 
 except:
     print exc_info()[0], ':', exc_info()[1]
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorCardsAndTransmit.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorCardsAndTransmit.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorCardsAndTransmit.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -82,4 +82,3 @@
 
 except:
     print exc_info()[0], ':', exc_info()[1]
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorReaders.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorReaders.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_MonitorReaders.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -60,4 +60,3 @@
 
 except:
     print exc_info()[0], ':', exc_info()[1]
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_TransmitCardObserver.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_TransmitCardObserver.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_TransmitCardObserver.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -67,4 +67,3 @@
 
 except:
     print exc_info()[0], ':', exc_info()[1]
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_apduTracerInterpreter.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_apduTracerInterpreter.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_apduTracerInterpreter.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -87,4 +87,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/framework/sample_toHexString.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/framework/sample_toHexString.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/framework/sample_toHexString.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -55,4 +55,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -96,4 +96,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -82,4 +82,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_getAttrib.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_getAttrib.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_getAttrib.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -144,4 +144,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_getStatusChange.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_getStatusChange.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_getStatusChange.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -100,4 +100,3 @@
 except error:
     import sys
     print sys.exc_info()[0], ':', sys.exc_info()[1]
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_listCards.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_listCards.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_listCards.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -76,4 +76,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_listInterfaces.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_listInterfaces.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_listInterfaces.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -89,4 +89,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_locateCards.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_locateCards.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_locateCards.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -118,4 +118,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -122,4 +122,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_readerGroups.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_readerGroups.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_readerGroups.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -118,4 +118,3 @@
 except error:
     import sys
     print sys.exc_info()[0], ':', sys.exc_info()[1]
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_readers.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_readers.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_readers.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -57,4 +57,3 @@
 except error:
     import sys
     print sys.exc_info()[0], ':', sys.exc_info()[1]
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_selectDFTelecom.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_selectDFTelecom.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_selectDFTelecom.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -89,4 +89,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_transaction.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_transaction.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_transaction.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -93,4 +93,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/simple/getATR.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/simple/getATR.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/simple/getATR.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -40,4 +40,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/simple/selectDF_TELECOM.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/simple/selectDF_TELECOM.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/simple/selectDF_TELECOM.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -75,4 +75,3 @@
 if 'win32'==sys.platform:
     print 'press Enter to continue'
     sys.stdin.read(1)
-

Modified: trunk/pyscard/src/smartcard/Examples/wx/apdumanager/apdumanager.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/wx/apdumanager/apdumanager.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/wx/apdumanager/apdumanager.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -41,6 +41,3 @@
 if __name__ == "__main__":
     import sys
     main( sys.argv )
-
-
-

Modified: trunk/pyscard/src/smartcard/Examples/wx/cardmonitor/cardmonitor.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/wx/cardmonitor/cardmonitor.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/wx/cardmonitor/cardmonitor.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -97,6 +97,3 @@
 if __name__ == "__main__":
     import sys
     main( sys.argv )
-
-
-

Modified: trunk/pyscard/src/smartcard/Examples/wx/readerviewer/readerviewer.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/wx/readerviewer/readerviewer.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Examples/wx/readerviewer/readerviewer.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -38,6 +38,3 @@
 if __name__ == "__main__":
     import sys
     main( sys.argv )
-
-
-

Modified: trunk/pyscard/src/smartcard/Exceptions.py
===================================================================
--- trunk/pyscard/src/smartcard/Exceptions.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Exceptions.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -80,4 +80,3 @@
     """Raised when the system has no smartcard reader."""
     def __init__( self, message="" ):
         SmartcardException.__init__( self, 'no readers found' )
-

Modified: trunk/pyscard/src/smartcard/PassThruCardService.py
===================================================================
--- trunk/pyscard/src/smartcard/PassThruCardService.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/PassThruCardService.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -58,4 +58,3 @@
     data, sw1, sw2 = cs.connection.transmit( SELECT + DF_TELECOM )
     print "%X %X" % (sw1, sw2)
     cs.connection.disconnect()
-

Modified: trunk/pyscard/src/smartcard/ReaderMonitoring.py
===================================================================
--- trunk/pyscard/src/smartcard/ReaderMonitoring.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/ReaderMonitoring.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -218,4 +218,3 @@
     t2.start()
     t1.join()
     t2.join()
-

Modified: trunk/pyscard/src/smartcard/Session.py
===================================================================
--- trunk/pyscard/src/smartcard/Session.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/Session.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -113,4 +113,3 @@
 if __name__ == '__main__':
     """Small sample illustrating the use of Session.py."""
     pass
-

Modified: trunk/pyscard/src/smartcard/System.py
===================================================================
--- trunk/pyscard/src/smartcard/System.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/System.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -64,4 +64,3 @@
     except:
         import sys
         print sys.exc_info()[1]
-

Modified: trunk/pyscard/src/smartcard/__init__.py
===================================================================
--- trunk/pyscard/src/smartcard/__init__.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/__init__.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -36,4 +36,3 @@
 # for legacy only
 from smartcard.System import listReaders
 from smartcard.Session import Session
-

Modified: trunk/pyscard/src/smartcard/pcsc/PCSCCardRequest.py
===================================================================
--- trunk/pyscard/src/smartcard/pcsc/PCSCCardRequest.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/pcsc/PCSCCardRequest.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -312,4 +312,3 @@
     cs.connection.connect()
     print cs.connection.getReader(), toHexString(cs.connection.getATR())
     cs.connection.disconnect()
-

Modified: trunk/pyscard/src/smartcard/pcsc/PCSCContext.py
===================================================================
--- trunk/pyscard/src/smartcard/pcsc/PCSCContext.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/pcsc/PCSCContext.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -55,4 +55,3 @@
     def __getattr__( self, name ):
         if self.instance:
             return getattr( self.instance, name )
-

Modified: trunk/pyscard/src/smartcard/pcsc/PCSCExceptions.py
===================================================================
--- trunk/pyscard/src/smartcard/pcsc/PCSCExceptions.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/pcsc/PCSCExceptions.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -70,4 +70,3 @@
         raise EstablishContextException( smartcard.scard.SCARD_E_NO_MEMORY )
     except:
         print sys.exc_info()[1]
-

Modified: trunk/pyscard/src/smartcard/pcsc/PCSCReader.py
===================================================================
--- trunk/pyscard/src/smartcard/pcsc/PCSCReader.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/pcsc/PCSCReader.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -115,4 +115,3 @@
     cc.connect()
     data, sw1, sw2 = cc.transmit( SELECT + DF_TELECOM )
     print "%X %X" % (sw1, sw2)
-

Modified: trunk/pyscard/src/smartcard/pcsc/PCSCReaderGroups.py
===================================================================
--- trunk/pyscard/src/smartcard/pcsc/PCSCReaderGroups.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/pcsc/PCSCReaderGroups.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -111,4 +111,3 @@
 
 if __name__ == '__main__':
     print PCSCReaderGroups()
-

Modified: trunk/pyscard/src/smartcard/reader/Reader.py
===================================================================
--- trunk/pyscard/src/smartcard/reader/Reader.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/reader/Reader.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -60,4 +60,3 @@
     def __str__( self ):
         """Returns card reader name string for str(object) calls."""
         return self.name
-

Modified: trunk/pyscard/src/smartcard/reader/ReaderFactory.py
===================================================================
--- trunk/pyscard/src/smartcard/reader/ReaderFactory.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/reader/ReaderFactory.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -53,4 +53,3 @@
             ReaderFactory.factories[clazz] = get_class( clazz ).Factory()
         return ReaderFactory.factories[clazz].create( readername )
     createReader = staticmethod(createReader)
-

Modified: trunk/pyscard/src/smartcard/reader/ReaderGroups.py
===================================================================
--- trunk/pyscard/src/smartcard/reader/ReaderGroups.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/reader/ReaderGroups.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -103,4 +103,3 @@
 
 if __name__ == '__main__':
     print readergroups()
-

Modified: trunk/pyscard/src/smartcard/reader/__init__.py
===================================================================
--- trunk/pyscard/src/smartcard/reader/__init__.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/reader/__init__.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -1 +0,0 @@
-

Modified: trunk/pyscard/src/smartcard/sw/ErrorChecker.py
===================================================================
--- trunk/pyscard/src/smartcard/sw/ErrorChecker.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/sw/ErrorChecker.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -41,4 +41,3 @@
 
         Derived classes must raise a smartcard.sw.SWException upon error."""
         pass
-

Modified: trunk/pyscard/src/smartcard/sw/ErrorCheckingChain.py
===================================================================
--- trunk/pyscard/src/smartcard/sw/ErrorCheckingChain.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/sw/ErrorCheckingChain.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -81,4 +81,3 @@
         if self.end():
             return
         return self.next()( data, sw1, sw2 )
-

Modified: trunk/pyscard/src/smartcard/sw/ISO7816_4ErrorChecker.py
===================================================================
--- trunk/pyscard/src/smartcard/sw/ISO7816_4ErrorChecker.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/sw/ISO7816_4ErrorChecker.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -157,4 +157,3 @@
         ecs( [], 0x6b, 0x00 )
     except smartcard.sw.SWExceptions.CheckingErrorException, e:
         print e, "%x %x" % (e.sw1, e.sw2)
-

Modified: trunk/pyscard/src/smartcard/sw/ISO7816_4_SW1ErrorChecker.py
===================================================================
--- trunk/pyscard/src/smartcard/sw/ISO7816_4_SW1ErrorChecker.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/sw/ISO7816_4_SW1ErrorChecker.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -82,4 +82,3 @@
         ecs( [], 0x66, 0x80 )
     except smartcard.sw.SWExceptions.SecurityRelatedException, e:
         print e, "%x %x" % (e.sw1, e.sw2)
-

Modified: trunk/pyscard/src/smartcard/sw/ISO7816_8ErrorChecker.py
===================================================================
--- trunk/pyscard/src/smartcard/sw/ISO7816_8ErrorChecker.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/sw/ISO7816_8ErrorChecker.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -131,4 +131,3 @@
         ecs( [], 0x66, 0x87 )
     except smartcard.sw.SWExceptions.SecurityRelatedException, e:
         print e, "%x %x" % (e.sw1, e.sw2)
-

Modified: trunk/pyscard/src/smartcard/sw/ISO7816_9ErrorChecker.py
===================================================================
--- trunk/pyscard/src/smartcard/sw/ISO7816_9ErrorChecker.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/sw/ISO7816_9ErrorChecker.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -96,4 +96,3 @@
         ecs( [], 0x6A, 0x8A )
     except smartcard.sw.SWExceptions.CheckingErrorException, e:
         print e, "%x %x" % (e.sw1, e.sw2)
-

Modified: trunk/pyscard/src/smartcard/sw/SWExceptions.py
===================================================================
--- trunk/pyscard/src/smartcard/sw/SWExceptions.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/sw/SWExceptions.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -65,4 +65,3 @@
     Examples of checking error: sw1=67 to 6F (ISO781604)."""
     def __init__( self, data, sw1, sw2, message="" ):
         SWException.__init__( self, data, sw1, sw2, "checking error - " + message )
-

Modified: trunk/pyscard/src/smartcard/sw/__init__.py
===================================================================
--- trunk/pyscard/src/smartcard/sw/__init__.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/sw/__init__.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -21,4 +21,3 @@
 along with pyscard; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 """
-

Modified: trunk/pyscard/src/smartcard/sw/op21_ErrorChecker.py
===================================================================
--- trunk/pyscard/src/smartcard/sw/op21_ErrorChecker.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/sw/op21_ErrorChecker.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -124,4 +124,3 @@
         ecs( [], 0x94, 0x84 )
     except smartcard.sw.SWExceptions.CheckingErrorException, e:
         print e, "%x %x" % (e.sw1, e.sw2)
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_ATR.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_ATR.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_ATR.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -68,4 +68,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_CAtr.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_CAtr.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_CAtr.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -119,4 +119,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_Card.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_Card.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_Card.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -108,4 +108,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_CardConnection.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_CardConnection.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_CardConnection.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -173,4 +173,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_CardMonitor.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_CardMonitor.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_CardMonitor.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -100,4 +100,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_CardRequest.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_CardRequest.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_CardRequest.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -132,4 +132,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_CardService.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_CardService.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_CardService.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -73,4 +73,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_CardType.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_CardType.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_CardType.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -136,4 +136,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_ErrorChecking.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_ErrorChecking.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_ErrorChecking.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -280,4 +280,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_ExclusiveCardConnection.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_ExclusiveCardConnection.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_ExclusiveCardConnection.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -126,4 +126,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_readergroups.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_readergroups.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_readergroups.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -152,4 +152,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_readermonitor.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_readermonitor.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_readermonitor.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -100,4 +100,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_readermonitorstress.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_readermonitorstress.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_readermonitorstress.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -174,4 +174,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testcase_readers.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_readers.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_readers.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -104,4 +104,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/framework/testsuite_framework.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testsuite_framework.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/framework/testsuite_framework.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -57,4 +57,3 @@
 if __name__ == '__main__':
     configcheck.checklocalconfig()
     unittest.main(defaultTest='suite')
-

Modified: trunk/pyscard/src/smartcard/test/frameworkpcsc/testcase_pcscreadergroups.py
===================================================================
--- trunk/pyscard/src/smartcard/test/frameworkpcsc/testcase_pcscreadergroups.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/frameworkpcsc/testcase_pcscreadergroups.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -157,4 +157,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/frameworkpcsc/testsuite_frameworkpcsc.py
===================================================================
--- trunk/pyscard/src/smartcard/test/frameworkpcsc/testsuite_frameworkpcsc.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/frameworkpcsc/testsuite_frameworkpcsc.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -42,4 +42,3 @@
 if __name__ == '__main__':
     configcheck.checklocalconfig()
     unittest.main(defaultTest='suite')
-

Modified: trunk/pyscard/src/smartcard/test/manual/testcase_manualCardRequest.py
===================================================================
--- trunk/pyscard/src/smartcard/test/manual/testcase_manualCardRequest.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/manual/testcase_manualCardRequest.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -196,4 +196,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -93,4 +93,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -104,4 +104,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/scard/testcase_geterrormessage.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_geterrormessage.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_geterrormessage.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -61,4 +61,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/scard/testcase_listcards.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_listcards.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_listcards.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -157,4 +157,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -113,4 +113,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/scard/testcase_readergroups.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_readergroups.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_readergroups.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -128,4 +128,3 @@
 if __name__ == '__main__':
     # When this module is executed from the command-line, run all its tests
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -107,4 +107,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -100,4 +100,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

Modified: trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -49,4 +49,3 @@
 if __name__ == '__main__':
     configcheck.checklocalconfig()
     unittest.main(defaultTest='suite')
-

Modified: trunk/pyscard/src/smartcard/ulist.py
===================================================================
--- trunk/pyscard/src/smartcard/ulist.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/ulist.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -116,4 +116,3 @@
     def __onremoveitem__( self, item ):
         """Called for each item removed. Override in subclasses for adding custom action."""
         pass
-

Modified: trunk/pyscard/src/smartcard/wx/APDUTracerPanel.py
===================================================================
--- trunk/pyscard/src/smartcard/wx/APDUTracerPanel.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/wx/APDUTracerPanel.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -71,4 +71,3 @@
                 apduline += "< " + toHexString( ccevent.args[0]) + "%-2X %-2X" % tuple(ccevent.args[-2:] )
 
         self.apdutextctrl.AppendText( apduline + "\n" )
-

Modified: trunk/pyscard/src/smartcard/wx/CardAndReaderTreePanel.py
===================================================================
--- trunk/pyscard/src/smartcard/wx/CardAndReaderTreePanel.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/wx/CardAndReaderTreePanel.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -360,4 +360,3 @@
             self.readermonitor.deleteObserver( self.readertreereaderobserver )
             self.cardmonitor.deleteObserver( self.readertreecardobserver )
         event.Skip()
-

Modified: trunk/pyscard/src/smartcard/wx/ReaderToolbar.py
===================================================================
--- trunk/pyscard/src/smartcard/wx/ReaderToolbar.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/wx/ReaderToolbar.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -86,4 +86,3 @@
         self.AddSeparator()
 
         self.Realize()
-

Modified: trunk/pyscard/src/smartcard/wx/SimpleSCardAppEventObserver.py
===================================================================
--- trunk/pyscard/src/smartcard/wx/SimpleSCardAppEventObserver.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/wx/SimpleSCardAppEventObserver.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -52,4 +52,3 @@
     def OnSelectReader( self, reader ):
         """Called when a reader is selected in the reader tree control or toolbar."""
         self.selectedreader = reader
-

Modified: trunk/pyscard/src/smartcard/wx/SimpleSCardAppFrame.py
===================================================================
--- trunk/pyscard/src/smartcard/wx/SimpleSCardAppFrame.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/wx/SimpleSCardAppFrame.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -305,4 +305,3 @@
         reader = cb.GetClientData(cb.GetSelection())
         if isinstance( reader, smartcard.reader.Reader.Reader ):
             self.treeuserpanel.dialogpanel.OnActivateReader( reader )
-

Modified: trunk/pyscard/src/smartcard/wx/__init__.py
===================================================================
--- trunk/pyscard/src/smartcard/wx/__init__.py	2009-11-16 10:38:57 UTC (rev 328)
+++ trunk/pyscard/src/smartcard/wx/__init__.py	2009-11-16 10:51:53 UTC (rev 329)
@@ -45,4 +45,3 @@
         ICO_SMARTCARD = os.path.join( "images", 'smartcard.ico' )
     if os.path.exists( os.path.join( "images", 'reader.ico' ) ):
         ICO_READER = os.path.join( "images", 'reader.ico' )
-


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

[Pyscard-devel] SF.net SVN: pyscard:[328] trunk/pyscard/src/smartcard

From: <lu...@us...> - 2009-11-16 10:39:06

Revision: 328
          http://pyscard.svn.sourceforge.net/pyscard/?rev=328&view=rev
Author:   ludov
Date:     2009-11-16 10:38:57 +0000 (Mon, 16 Nov 2009)

Log Message:
-----------
W292 no newline at end of file

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/Observer.py
    trunk/pyscard/src/smartcard/Synchronization.py

Modified: trunk/pyscard/src/smartcard/Observer.py
===================================================================
--- trunk/pyscard/src/smartcard/Observer.py	2009-11-16 10:34:42 UTC (rev 327)
+++ trunk/pyscard/src/smartcard/Observer.py	2009-11-16 10:38:57 UTC (rev 328)
@@ -65,4 +65,4 @@
   "addObserver deleteObserver deleteObservers " +
   "setChanged clearChanged hasChanged " +
   "countObservers")
-#:~
\ No newline at end of file
+#:~

Modified: trunk/pyscard/src/smartcard/Synchronization.py
===================================================================
--- trunk/pyscard/src/smartcard/Synchronization.py	2009-11-16 10:34:42 UTC (rev 327)
+++ trunk/pyscard/src/smartcard/Synchronization.py	2009-11-16 10:38:57 UTC (rev 328)
@@ -36,4 +36,4 @@
 class Synchronization:
   def __init__(self):
     self.mutex = RLock()
-#:~
\ No newline at end of file
+#:~


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

[Pyscard-devel] SF.net SVN: pyscard:[327] trunk/contrib/parseATR

From: <lu...@us...> - 2009-11-16 10:34:50

Revision: 327
          http://pyscard.svn.sourceforge.net/pyscard/?rev=327&view=rev
Author:   ludov
Date:     2009-11-16 10:34:42 +0000 (Mon, 16 Nov 2009)

Log Message:
-----------
fix problems reported by pep8

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py
    trunk/contrib/parseATR/parseATRhtml.py
    trunk/contrib/parseATR/stress_test.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-11-13 19:56:15 UTC (rev 326)
+++ trunk/contrib/parseATR/parseATR.py	2009-11-16 10:34:42 UTC (rev 327)
@@ -23,14 +23,18 @@
 T = -1
 
 import exceptions
+
+
 class ParseAtrException(exceptions.Exception):
     """Base class for exceptions in this module."""
+
     def __init__(self, text):
         self.text = text
 
     def __str__(self):
         return self.text
 
+
 def toHexString(bytes=[]):
     """ return a hex list """
     return " ".join(["%02X" % b for b in bytes])
@@ -51,16 +55,16 @@
     if len(atr) > 0:
         raise ParseAtrException('warning: odd string, remainder: %r' % atr)
 
-    atr = map(lambda x: int(x,16), res)
+    atr = map(lambda x: int(x, 16), res)
     return atr
 
-def int2bin(i, padding = 8):
+def int2bin(i, padding=8):
     """ convert an integer into its binary representation """
     b = ""
     while i > 0:
         b = str(i % 2) + b
         i >>= 1
-    b = "0" * (padding-len(b)) +b
+    b = "0" * (padding - len(b)) + b
     return b
 
 def parseATR(atr_txt):
@@ -77,7 +81,7 @@
     pointer = 1
     # protocol number
     pn = 1
-    
+
     # store number of historical bytes
     atr["hbn"] = TDi & 0xF
 
@@ -106,15 +110,15 @@
             pn += 1
         else:
             break
-    
-    # Store number of protocols        
+
+    # Store number of protocols
     atr["pn"] = pn
-    
+
     # Store historical bytes
-    atr["hb"] = atr_txt[pointer+1:pointer+1+hb_length]
-    
+    atr["hb"] = atr_txt[pointer + 1: pointer + 1 + hb_length]
+
     if len(atr["hb"]) < hb_length:
-        missing = hb_length-len(atr["hb"])
+        missing = hb_length - len(atr["hb"])
         if missing > 1:
             (t1, t2) = ("s", "are")
         else:
@@ -122,7 +126,7 @@
         raise ParseAtrException("ERROR! ATR is truncated: %d byte%s %s missing" % (missing, t1, t2))
 
     # Store TCK
-    if (atr.has_key("TCK")):
+    if "TCK" in atr:
         atr["TCK"] = atr_txt[-1]
 
     return atr
@@ -130,11 +134,11 @@
 def TA1(v):
     Fi = (372, 372, 558, 744, 1116, 1488, 1860, "RFU", "RFU", 512, 768, 1024, 1536, 2048, "RFU", "RFU")
     Di = ("RFU", 1, 2, 4, 8, 16, 32, "RFU", 12, 20, "RFU", "RFU", "RFU", "RFU", "RFU", "RFU")
-    FMax = (4, 5, 6, 8, 12, 16, 20, "RFU", "RFU", 5, 7.5, 10, 15, 20, "RFU", "RFU") 
+    FMax = (4, 5, 6, 8, 12, 16, 20, "RFU", "RFU", 5, 7.5, 10, 15, 20, "RFU", "RFU")
     F = v >> 4
     D = v & 0xF
-    value = Fi[F]/Di[D]
-    return "Fi=%s, Di=%s, %g cycles/ETU (%d bits/s at 4.00 MHz, %d bits/s for fMax=%d MHz)" % (Fi[F], Di[D], value, 4000000/value, FMax[F]*1000000/value, FMax[F])
+    value = Fi[F] / Di[D]
+    return "Fi=%s, Di=%s, %g cycles/ETU (%d bits/s at 4.00 MHz, %d bits/s for fMax=%d MHz)" % (Fi[F], Di[D], value, 4000000 / value, FMax[F] * 1000000 / value, FMax[F])
 
 def TA2(v):
     F = v >> 4
@@ -157,7 +161,7 @@
 
 def TA4(v):
     return TAn(4, v)
-    
+
 def TAn(i, v):
     XI = ("not supported", "state L", "state H", "no preference")
     if (T == 1):
@@ -178,7 +182,7 @@
         if (D & 0x10):
             Class.append("E RFU")
 
-        text = "Clock stop: %s - Class accepted by the card: %s" % (XI[F],''.join(Class))
+        text = "Clock stop: %s - Class accepted by the card: %s" % (XI[F], ''.join(Class))
     return text
 
 def TB1(v):
@@ -191,8 +195,8 @@
     return text
 
 def TB2(v):
-    text = ["Programming param PI2 (PI1 should be ignored): %d" % v,]
-    if ((v>49) or (v<251)):
+    text = ["Programming param PI2 (PI1 should be ignored): %d" % v, ]
+    if ((v > 49) or (v < 251)):
         text.append(" (dV)")
     else:
         text.append(" is RFU")
@@ -209,7 +213,7 @@
     if (T == 1):
         BWI = v >> 4
         CWI = v % 16
-        
+
         text = "Block Waiting Integer: %d - Character Waiting Integer: %d" % (BWI, CWI)
     return text
 
@@ -257,7 +261,7 @@
     global T
     Y = v >> 4
     T = v & 0xF
-    text = "Y(i+1) = b%s, Protocol T=%d" % (int2bin(Y,4), T)
+    text = "Y(i+1) = b%s, Protocol T=%d" % (int2bin(Y, 4), T)
     return text
 
 def life_cycle_status(lcs):
@@ -282,7 +286,7 @@
     return text
 
 def data_coding(dc):
-    # Table 87 - Second software function table (data coding byte) 
+    # Table 87 - Second software function table (data coding byte)
     # ISO 7816-4:2004, page 60
     text = []
 
@@ -291,7 +295,7 @@
 
     # get bits 6 and 7
     text.append("        - Behaviour of write functions: ")
-    v = (dc & (64+32)) >> 5
+    v = (dc & (64 + 32)) >> 5
     t = ["one-time write\n", "proprietary\n", "write OR\n", "write AND\n"]
     text.append(t[v])
 
@@ -301,7 +305,7 @@
     text.append("valid\n")
 
     text.append("        - Data unit in quartets: %d" % (dc & 15))
-    
+
     return ''.join(text)
 
 def selection_methods(sm):
@@ -311,7 +315,7 @@
 
     if sm & 1:
         text.append("        - Record identifier supported\n")
-    
+
     if sm & 2:
         text.append("        - Record number supported\n")
 
@@ -320,7 +324,7 @@
 
     if sm & 8:
         text.append("        - Implicit DF selection\n")
-    
+
     if sm & 16:
         text.append("        - DF selection by file identifier\n")
 
@@ -334,7 +338,7 @@
         text.append("        - DF selection by full DF name\n")
 
     return ''.join(text)
-        
+
 def selection_mode(sm):
     # Table 87 - Second software function table (data coding byte)
     # ISO 7816-4:2004, page 60
@@ -376,7 +380,7 @@
 
     if cc & 64:
         text.append("        - Extended Lc and Le fields\n")
-        
+
     if cc & 32:
         text.append("        - RFU (should not happen)\n")
 
@@ -404,7 +408,7 @@
 
     if cs & 16:
         text.append("        - BER-TLV data objects available in EF.ATR\n")
-    
+
     text.append("        - EF.DIR and EF.ATR access services: ")
     v = (cs >> 1) & 7
     if v == 4:
@@ -420,7 +424,7 @@
         text.append("        - Card without MF\n")
     else:
         text.append("        - Card with MF\n")
-    
+
     return ''.join(text)
 
 def compact_tlv(historical_bytes):
@@ -433,7 +437,7 @@
 
     tag = tlv / 16
     len = tlv % 16
-    
+
     text = []
     text.append("    Tag: %d, Len: %d" % (tag, len))
 
@@ -443,7 +447,7 @@
 
     elif tag == 2:
         text.append(" (issuer identification number, ISO 7812-1)\n")
-        text.append("      Issuer identification number: "  + toHexString(historical_bytes[:len]))
+        text.append("      Issuer identification number: " + toHexString(historical_bytes[:len]))
 
     elif tag == 3:
         text.append(" (card service data byte)\n")
@@ -457,11 +461,11 @@
             else:
                 text.append("      Card service data byte: %d\n" % cs)
                 text.append(card_service(cs))
-            
+
     elif tag == 4:
         text.append(" (initial access data)\n")
         text.append("      Initial access data: " + toHexString(historical_bytes[:len]) + "\n")
-        
+
     elif tag == 5:
         text.append(" (card issuer's data)\n")
         text.append("      Card issuer data: " + toHexString(historical_bytes[:len]) + "\n")
@@ -515,7 +519,7 @@
             sw2 = historical_bytes[2]
             text.append("      LCS (life card cycle): %d\n" % lcs)
             text.append("      SW: %02X %02X" % (sw1, sw2))
-    
+
     elif tag == 15:
         text.append(" (application identifier)\n")
         text.append("      Application identifier: " + toHexString(historical_bytes[:len]))
@@ -537,7 +541,7 @@
         return ""
 
     hb_category = historical_bytes.pop(0)
-    
+
     text.append("  Category indicator byte: 0x%02X" % hb_category)
 
     if hb_category == 0x00:
@@ -557,7 +561,7 @@
         (lcs, sw1, sw2) = status[:3]
         text.append("    Mandatory status indicator (3 last bytes)\n")
         text.append("      LCS (life card cycle): %d (%s)" % (lcs, life_cycle_status(lcs)))
-        text.append( "      SW: %02X%02X (%s)" % (sw1, sw2, "")) #Chipcard::PCSC::Card::ISO7816Error("$sw1 $sw2"))
+        text.append("      SW: %02X%02X (%s)" % (sw1, sw2, "")) #Chipcard::PCSC::Card::ISO7816Error("$sw1 $sw2"))
 
     elif hb_category == 0x80:
         text.append(" (compact TLV data object)\n")
@@ -579,11 +583,11 @@
 
 def compute_tck(atr):
     # do not include TS byte
-    s = atr["atr"][0];
+    s = atr["atr"][0]
     for e in atr["atr"]:
         s ^= e
     # remove TCK
-    s ^= atr["atr"][-1];
+    s ^= atr["atr"][-1]
     return s
 
 def colorize_txt(l):
@@ -607,9 +611,9 @@
 
 def html_escape(text):
     """Produce entities within text."""
-    L=[]
+    L = []
     for c in text:
-        L.append(html_escape_table.get(c,c))
+        L.append(html_escape_table.get(c, c))
     return "".join(L)
 
 def colorize_html(l):
@@ -630,13 +634,13 @@
 
     Y1 = atr["T0"] >> 4
     K = atr["T0"] & 0xF
-    text.append(["T0 = 0x%02X" % atr["T0"], "Y(1): b%s, K: %d (historical bytes)" % (int2bin(Y1, padding = 4), K)])
+    text.append(["T0 = 0x%02X" % atr["T0"], "Y(1): b%s, K: %d (historical bytes)" % (int2bin(Y1, padding=4), K)])
 
     for i in (1, 2, 3, 4):
         separator = False
         for p in ("A", "B", "C", "D"):
             key = "T%s%d" % (p, i)
-            if (atr.has_key(key)):
+            if key in atr:
                 v = atr[key]
                 t = [" T%s(%d) = 0x%02X" % (p, i, v)]
                 t.append(eval("%s(%d)" % (key, v)))
@@ -645,7 +649,7 @@
         if separator:
             text.append(["----"])
 
-    if (atr.has_key("hb")):
+    if "hb" in atr:
         t = ["Historical bytes"]
         t.append(toHexString(atr["hb"]))
         text.append(t)
@@ -654,7 +658,7 @@
         if t:
             text.append(t)
 
-    if (atr.has_key("TCK")):
+    if "TCK" in atr:
         t = ["TCK = 0x%02X " % atr["TCK"]]
         tck = compute_tck(atr)
         if tck == atr["TCK"]:
@@ -679,7 +683,7 @@
             # found the ATR
             for desc in file:
                 if desc == "\n":
-                    break;
+                    break
                 # get all the possible card descriptions
                 card.append(desc.strip())
     file.close()

Modified: trunk/contrib/parseATR/parseATRhtml.py
===================================================================
--- trunk/contrib/parseATR/parseATRhtml.py	2009-11-13 19:56:15 UTC (rev 326)
+++ trunk/contrib/parseATR/parseATRhtml.py	2009-11-16 10:34:42 UTC (rev 327)
@@ -35,10 +35,11 @@
 </body>
 </html>"""
 
+
 def colorize(l):
     text = '<tr><th align="right">' + html_escape(l[0]) + '</th>'
     if len(l) > 1:
-        t =  html_escape("".join(l[1:]))
+        t = html_escape("".join(l[1:]))
         if '\n' in t:
             t = "<pre>" + t + "</pre>"
         text += '<th align="left">' + t + '</th></tr>'
@@ -59,4 +60,3 @@
     print "<p>ATR: " + ATR + "<p>"
     print html
     print footer
-

Modified: trunk/contrib/parseATR/stress_test.py
===================================================================
--- trunk/contrib/parseATR/stress_test.py	2009-11-13 19:56:15 UTC (rev 326)
+++ trunk/contrib/parseATR/stress_test.py	2009-11-16 10:34:42 UTC (rev 327)
@@ -18,7 +18,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 """
 
-import sys, string
+import sys
+import string
 import parseATR
 
 List = "/usr/local/share/pcsc/smartcard_list.txt"


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

[Pyscard-devel] SF.net SVN: pyscard:[326] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-11-13 19:56:22

Revision: 326
          http://pyscard.svn.sourceforge.net/pyscard/?rev=326&view=rev
Author:   ludov
Date:     2009-11-13 19:56:15 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
add missing formatting \n

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-11-13 19:53:58 UTC (rev 325)
+++ trunk/contrib/parseATR/parseATR.py	2009-11-13 19:56:15 UTC (rev 326)
@@ -455,16 +455,16 @@
             if cs == None:
                 text.append("      Error in the ATR: expecting 1 byte and got 0")
             else:
-                text.append("      Card service data byte: %d" % cs)
+                text.append("      Card service data byte: %d\n" % cs)
                 text.append(card_service(cs))
             
     elif tag == 4:
         text.append(" (initial access data)\n")
-        text.append("      Initial access data: " + toHexString(historical_bytes[:len]))
+        text.append("      Initial access data: " + toHexString(historical_bytes[:len]) + "\n")
         
     elif tag == 5:
         text.append(" (card issuer's data)\n")
-        text.append("      Card issuer data: " + toHexString(historical_bytes[:len]))
+        text.append("      Card issuer data: " + toHexString(historical_bytes[:len]) + "\n")
 
     elif tag == 6:
         text.append(" (pre-issuing data)\n")
@@ -513,7 +513,7 @@
             lcs = historical_bytes[0]
             sw1 = historical_bytes[1]
             sw2 = historical_bytes[2]
-            text.append("      LCS (life card cycle): %d" % lcs)
+            text.append("      LCS (life card cycle): %d\n" % lcs)
             text.append("      SW: %02X %02X" % (sw1, sw2))
     
     elif tag == 15:


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

[Pyscard-devel] SF.net SVN: pyscard:[325] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-11-13 19:54:06

Revision: 325
          http://pyscard.svn.sourceforge.net/pyscard/?rev=325&view=rev
Author:   ludov
Date:     2009-11-13 19:53:58 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
normalize'): allow more than one space character between hex digits

Thanks to Alexei Bouznik for the patch

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-11-12 12:34:38 UTC (rev 324)
+++ trunk/contrib/parseATR/parseATR.py	2009-11-13 19:53:58 UTC (rev 325)
@@ -41,9 +41,17 @@
     "3B A7 00 40 18 80 65 A2 08 01 01 52"
     "3B:A7:00:40:18:80:65:A2:08:01:01:52"
     """
-    atr = atr.replace(":", " ")
-    atr = atr.split(" ")
-    atr = map(lambda x: int(x,16), atr)
+    atr = atr.replace(":", "")
+    atr = atr.replace(" ", "")
+
+    res = []
+    while len(atr) >= 2:
+        byte, atr = atr[:2], atr[2:]
+        res.append(byte)
+    if len(atr) > 0:
+        raise ParseAtrException('warning: odd string, remainder: %r' % atr)
+
+    atr = map(lambda x: int(x,16), res)
     return atr
 
 def int2bin(i, padding = 8):


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

[Pyscard-devel] SF.net SVN: pyscard:[324] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-11-12 12:34:50

Revision: 324
          http://pyscard.svn.sourceforge.net/pyscard/?rev=324&view=rev
Author:   ludov
Date:     2009-11-12 12:34:38 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
output reformat

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-11-12 12:32:36 UTC (rev 323)
+++ trunk/contrib/parseATR/parseATR.py	2009-11-12 12:34:38 UTC (rev 324)
@@ -691,6 +691,6 @@
 
     card = match_atr(ATR)
     if card:
-        print "\nPossibly identified card:", " ".join(card)
+        print "Possibly identified card:", " ".join(card)
     else:
-        print "\nUnknown card"
+        print "Unknown card"


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

[Pyscard-devel] SF.net SVN: pyscard:[323] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-11-12 12:32:44

Revision: 323
          http://pyscard.svn.sourceforge.net/pyscard/?rev=323&view=rev
Author:   ludov
Date:     2009-11-12 12:32:36 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
use sw2 instead of sw1 when needed (typo)

Thanks to Alexei Bouznik for the bug report

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-10-21 15:53:13 UTC (rev 322)
+++ trunk/contrib/parseATR/parseATR.py	2009-11-12 12:32:36 UTC (rev 323)
@@ -549,7 +549,7 @@
         (lcs, sw1, sw2) = status[:3]
         text.append("    Mandatory status indicator (3 last bytes)\n")
         text.append("      LCS (life card cycle): %d (%s)" % (lcs, life_cycle_status(lcs)))
-        text.append( "      SW: %02X%02X (%s)" % (sw1, sw1, "")) #Chipcard::PCSC::Card::ISO7816Error("$sw1 $sw2"))
+        text.append( "      SW: %02X%02X (%s)" % (sw1, sw2, "")) #Chipcard::PCSC::Card::ISO7816Error("$sw1 $sw2"))
 
     elif hb_category == 0x80:
         text.append(" (compact TLV data object)\n")


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

[Pyscard-devel] SF.net SVN: pyscard:[322] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-10-21 15:53:19

Revision: 322
          http://pyscard.svn.sourceforge.net/pyscard/?rev=322&view=rev
Author:   ludov
Date:     2009-10-21 15:53:13 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
remove extra ": "

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-10-21 15:50:17 UTC (rev 321)
+++ trunk/contrib/parseATR/parseATR.py	2009-10-21 15:53:13 UTC (rev 322)
@@ -638,7 +638,7 @@
             text.append(["----"])
 
     if (atr.has_key("hb")):
-        t = ["Historical bytes: "]
+        t = ["Historical bytes"]
         t.append(toHexString(atr["hb"]))
         text.append(t)
 


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

[Pyscard-devel] SF.net SVN: pyscard:[321] trunk/contrib/parseATR/parseATRhtml.py

From: <lu...@us...> - 2009-10-21 15:50:25

Revision: 321
          http://pyscard.svn.sourceforge.net/pyscard/?rev=321&view=rev
Author:   ludov
Date:     2009-10-21 15:50:17 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
text containing \n is displayed preformarted

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATRhtml.py

Modified: trunk/contrib/parseATR/parseATRhtml.py
===================================================================
--- trunk/contrib/parseATR/parseATRhtml.py	2009-10-21 15:39:38 UTC (rev 320)
+++ trunk/contrib/parseATR/parseATRhtml.py	2009-10-21 15:50:17 UTC (rev 321)
@@ -38,7 +38,10 @@
 def colorize(l):
     text = '<tr><th align="right">' + html_escape(l[0]) + '</th>'
     if len(l) > 1:
-        text += '<th align="left">' + html_escape("".join(l[1:])) + '</th></tr>'
+        t =  html_escape("".join(l[1:]))
+        if '\n' in t:
+            t = "<pre>" + t + "</pre>"
+        text += '<th align="left">' + t + '</th></tr>'
     return text
 
 if __name__ == "__main__":


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

[Pyscard-devel] SF.net SVN: pyscard:[320] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-10-21 15:39:47

Revision: 320
          http://pyscard.svn.sourceforge.net/pyscard/?rev=320&view=rev
Author:   ludov
Date:     2009-10-21 15:39:38 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
improve formating

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-10-04 14:59:00 UTC (rev 319)
+++ trunk/contrib/parseATR/parseATR.py	2009-10-21 15:39:38 UTC (rev 320)
@@ -460,7 +460,7 @@
 
     elif tag == 6:
         text.append(" (pre-issuing data)\n")
-        text.append("      Data: " + toHexString(historical_bytes[:len]))
+        text.append("      Data: " + toHexString(historical_bytes[:len]) + "\n")
 
     elif tag == 7:
         text.append(" (card capabilities)\n")
@@ -470,24 +470,24 @@
             except:
                 text.append("Error in the ATR: expecting 1 byte and got 0\n")
             else:
-                text.append("      Selection methods: %d" % sm)
+                text.append("      Selection methods: %d\n" % sm)
                 text.append(selection_mode(sm))
         elif len == 2:
             sm = historical_bytes[0]
             dc = historical_bytes[1]
-            text.append("      Selection methods: %d" % sm)
+            text.append("      Selection methods: %d\n" % sm)
             text.append(selection_methods(sm))
-            text.append("      Data coding byte: %d" % dc)
+            text.append("      Data coding byte: %d\n" % dc)
             text.append(data_coding(dc))
         elif len == 3:
             sm = historical_bytes[0]
             dc = historical_bytes[1]
             cc = historical_bytes[2]
-            text.append("      Selection methods: %d" % sm)
+            text.append("      Selection methods: %d\n" % sm)
             text.append(selection_mode(sm))
-            text.append("      Data coding byte: %d" % dc)
+            text.append("      Data coding byte: %d\n" % dc)
             text.append(data_coding(dc))
-            text.append("      Command chaining, length fields and logical channels: %d" % cc)
+            text.append("      Command chaining, length fields and logical channels: %d\n" % cc)
             text.append(command_chaining(cc))
         else:
             text.append("      wrong ATR")
@@ -567,7 +567,7 @@
     else:
         text.append(" (proprietary format)")
 
-    return ''.join(text)
+    return text
 
 def compute_tck(atr):
     # do not include TS byte


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

[Pyscard-devel] SF.net SVN: pyscard:[319] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-10-04 14:59:12

Revision: 319
          http://pyscard.svn.sourceforge.net/pyscard/?rev=319&view=rev
Author:   ludov
Date:     2009-10-04 14:59:00 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
ParseAtrException is a subclass of exceptions.Exception

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-10-04 14:19:19 UTC (rev 318)
+++ trunk/contrib/parseATR/parseATR.py	2009-10-04 14:59:00 UTC (rev 319)
@@ -22,10 +22,15 @@
 ATR_MAX_PROTOCOLS = 7
 T = -1
 
-class ParseAtrException(Exception):
+import exceptions
+class ParseAtrException(exceptions.Exception):
     """Base class for exceptions in this module."""
-    pass
+    def __init__(self, text):
+        self.text = text
 
+    def __str__(self):
+        return self.text
+
 def toHexString(bytes=[]):
     """ return a hex list """
     return " ".join(["%02X" % b for b in bytes])


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

[Pyscard-devel] SF.net SVN: pyscard:[318] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-10-04 14:19:31

Revision: 318
          http://pyscard.svn.sourceforge.net/pyscard/?rev=318&view=rev
Author:   ludov
Date:     2009-10-04 14:19:19 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
normalize ATR before matching

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-10-04 13:26:23 UTC (rev 317)
+++ trunk/contrib/parseATR/parseATR.py	2009-10-04 14:19:19 UTC (rev 318)
@@ -655,6 +655,7 @@
 def match_atr(atr):
     """ try to find card description for a given ATR """
     card = []
+    atr = toHexString(normalize(atr))
     file = open("smartcard_list.txt")
     for line in file:
         if line.startswith("#"):
@@ -679,7 +680,7 @@
         #ATR = "3B A7 00 40 18 80 65 A2 08 01 01 52"
         ATR = "3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 31 20 52 65 76 42 30 36 4E"
     atr = parseATR(ATR)
-    print "ATR:", ATR
+    print "ATR:", toHexString(normalize(ATR))
     text = atr_display_txt(atr)
     print text
 


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

[Pyscard-devel] SF.net SVN: pyscard:[317] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-10-04 13:26:39

Revision: 317
          http://pyscard.svn.sourceforge.net/pyscard/?rev=317&view=rev
Author:   ludov
Date:     2009-10-04 13:26:23 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
try to find card description for a given ATR

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-10-04 11:17:03 UTC (rev 316)
+++ trunk/contrib/parseATR/parseATR.py	2009-10-04 13:26:23 UTC (rev 317)
@@ -652,6 +652,25 @@
 
     return "\n".join([colorize(t) for t in text])
 
+def match_atr(atr):
+    """ try to find card description for a given ATR """
+    card = []
+    file = open("smartcard_list.txt")
+    for line in file:
+        if line.startswith("#"):
+            continue
+        line = line.rstrip("\n")
+
+        if line == atr:
+            # found the ATR
+            for desc in file:
+                if desc == "\n":
+                    break;
+                # get all the possible card descriptions
+                card.append(desc.strip())
+    file.close()
+    return card
+
 if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1:
@@ -663,3 +682,9 @@
     print "ATR:", ATR
     text = atr_display_txt(atr)
     print text
+
+    card = match_atr(ATR)
+    if card:
+        print "\nPossibly identified card:", " ".join(card)
+    else:
+        print "\nUnknown card"


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

[Pyscard-devel] SF.net SVN: pyscard:[316] trunk/contrib/parseATR/parseATR.py

From: <lu...@us...> - 2009-10-04 11:17:13

Revision: 316
          http://pyscard.svn.sourceforge.net/pyscard/?rev=316&view=rev
Author:   ludov
Date:     2009-10-04 11:17:03 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
use a locally defined toHexString()

Modified Paths:
--------------
    trunk/contrib/parseATR/parseATR.py

Modified: trunk/contrib/parseATR/parseATR.py
===================================================================
--- trunk/contrib/parseATR/parseATR.py	2009-10-04 10:56:32 UTC (rev 315)
+++ trunk/contrib/parseATR/parseATR.py	2009-10-04 11:17:03 UTC (rev 316)
@@ -18,8 +18,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 """
 
-import smartcard.util
-
 ATR_PROTOCOL_TYPE_T0 = 0
 ATR_MAX_PROTOCOLS = 7
 T = -1
@@ -28,6 +26,10 @@
     """Base class for exceptions in this module."""
     pass
 
+def toHexString(bytes=[]):
+    """ return a hex list """
+    return " ".join(["%02X" % b for b in bytes])
+
 def normalize(atr):
     """ transform an ATR in list of integers
     valid input formats are
@@ -424,11 +426,11 @@
 
     if tag == 1:
         text.append(" (country code, ISO 3166-1)\n")
-        text.append("      Country code: " + smartcard.util.toHexString(historical_bytes[:len], smartcard.util.HEX))
+        text.append("      Country code: " + toHexString(historical_bytes[:len]))
 
     elif tag == 2:
         text.append(" (issuer identification number, ISO 7812-1)\n")
-        text.append("      Issuer identification number: "  + smartcard.util.toHexString(historical_bytes[:len], smartcard.util.HEX))
+        text.append("      Issuer identification number: "  + toHexString(historical_bytes[:len]))
 
     elif tag == 3:
         text.append(" (card service data byte)\n")
@@ -445,15 +447,15 @@
             
     elif tag == 4:
         text.append(" (initial access data)\n")
-        text.append("      Initial access data: " + smartcard.util.toHexString(historical_bytes[:len], smartcard.util.HEX))
+        text.append("      Initial access data: " + toHexString(historical_bytes[:len]))
         
     elif tag == 5:
         text.append(" (card issuer's data)\n")
-        text.append("      Card issuer data: " + smartcard.util.toHexString(historical_bytes[:len], smartcard.util.HEX))
+        text.append("      Card issuer data: " + toHexString(historical_bytes[:len]))
 
     elif tag == 6:
         text.append(" (pre-issuing data)\n")
-        text.append("      Data: " + smartcard.util.toHexString(historical_bytes[:len], smartcard.util.HEX))
+        text.append("      Data: " + toHexString(historical_bytes[:len]))
 
     elif tag == 7:
         text.append(" (card capabilities)\n")
@@ -503,11 +505,11 @@
     
     elif tag == 15:
         text.append(" (application identifier)\n")
-        text.append("      Application identifier: " + smartcard.util.toHexString(historical_bytes[:len], smartcard.util.HEX))
+        text.append("      Application identifier: " + toHexString(historical_bytes[:len]))
 
     else:
         text.append(" (unknown)\n")
-        text.append("      Value: " + smartcard.util.toHexString(historical_bytes[:len], smartcard.util.HEX))
+        text.append("      Value: " + toHexString(historical_bytes[:len]))
 
     # consume len bytes of historic
     del historical_bytes[0:len]
@@ -632,7 +634,7 @@
 
     if (atr.has_key("hb")):
         t = ["Historical bytes: "]
-        t.append(smartcard.util.toHexString(atr["hb"], smartcard.util.HEX))
+        t.append(toHexString(atr["hb"]))
         text.append(t)
 
         t = analyse_histrorical_bytes(atr["hb"])


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

[Pyscard-devel] SF.net SVN: pyscard:[315] trunk/contrib/parseATR/parseATRhtml.py

From: <lu...@us...> - 2009-10-04 10:56:44

Revision: 315
          http://pyscard.svn.sourceforge.net/pyscard/?rev=315&view=rev
Author:   ludov
Date:     2009-10-04 10:56:32 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
convert an ATR in a (HTML) human readable format

Added Paths:
-----------
    trunk/contrib/parseATR/parseATRhtml.py

Added: trunk/contrib/parseATR/parseATRhtml.py
===================================================================
--- trunk/contrib/parseATR/parseATRhtml.py	                        (rev 0)
+++ trunk/contrib/parseATR/parseATRhtml.py	2009-10-04 10:56:32 UTC (rev 315)
@@ -0,0 +1,59 @@
+#! /usr/bin/env python
+"""
+    parseATRhtml: convert an ATR in a (HTML) human readable format
+    Copyright (C) 2009   Ludovic Rousseau
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+"""
+
+from parseATR import *
+
+header = """<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
+ "http://www.w3.org/TR/1998/REC-html40-19980424/strict.dtd">
+
+<html>
+<head>
+<title>ATR Parsing</title>
+</head>
+<body>
+<table border="1">"""
+
+footer = """</table>
+</body>
+</html>"""
+
+def colorize(l):
+    text = '<tr><th align="right">' + html_escape(l[0]) + '</th>'
+    if len(l) > 1:
+        text += '<th align="left">' + html_escape("".join(l[1:])) + '</th></tr>'
+    return text
+
+if __name__ == "__main__":
+    import sys
+    if len(sys.argv) > 1:
+        ATR = " ".join(sys.argv[1:])
+    else:
+        #ATR = "3B A7 00 40 18 80 65 A2 08 01 01 52"
+        ATR = "3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 31 20 52 65 76 42 30 36 4E"
+    atr = parseATR(ATR)
+    #print "ATR:", ATR
+    html = atr_display(atr, colorize)
+
+    print header
+    print "<p>ATR: " + ATR + "<p>"
+    print html
+    print footer
+


Property changes on: trunk/contrib/parseATR/parseATRhtml.py
___________________________________________________________________
Added: svn:executable
   + *


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

Flat | Threaded

<< < 1 .. 15 16 17 18 19 .. 23 > >> (Page 17 of 23)