[Pyscard-devel] SF.net SVN: pyscard:[284] trunk/pyscard/src/smartcard/Examples/scard-api

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

Revision: 284
          http://pyscard.svn.sourceforge.net/pyscard/?rev=284&view=rev
Author:   ludov
Date:     2009-06-08 13:28:49 +0000 (Mon, 08 Jun 2009)

Log Message:
-----------
fix the DeprecationWarning: raising a string exception is deprecated

Modified Paths:
--------------
    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_pinpad.py

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py	2009-04-18 08:07:15 UTC (rev 283)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_control.py	2009-06-08 13:28:49 UTC (rev 284)
@@ -31,7 +31,7 @@
 try:
     hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
     if hresult!=0:
-        raise  'Failed to establish context: ' + SCardGetErrorMessage(hresult)
+        raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult)
     print 'Context established!'
 
     try:
@@ -85,7 +85,7 @@
     finally:
         hresult = SCardReleaseContext( hcontext )
         if hresult!=SCARD_S_SUCCESS:
-            raise  'Failed to release context: ' + SCardGetErrorMessage(hresult)
+            raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult)
         print 'Released context.'
 
 except:

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py	2009-04-18 08:07:15 UTC (rev 283)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_getATR.py	2009-06-08 13:28:49 UTC (rev 284)
@@ -30,15 +30,15 @@
 try:
     hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
     if hresult!=0:
-        raise  'Failed to establish context: ' + SCardGetErrorMessage(hresult)
+        raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult)
     print 'Context established!'
 
     try:
         hresult, readers = SCardListReaders( hcontext, [] )
         if hresult!=0:
-            raise  'Failed to list readers: ' + SCardGetErrorMessage(hresult)
+            raise error, 'Failed to list readers: ' + SCardGetErrorMessage(hresult)
         if len(readers)<1:
-            raise  'No smart card readers'
+            raise Exception('No smart card readers')
         print 'PCSC Readers:', readers
 
         for reader in readers:
@@ -71,7 +71,7 @@
     finally:
         hresult = SCardReleaseContext( hcontext )
         if hresult!=0:
-            raise  'Failed to release context: ' + SCardGetErrorMessage(hresult)
+            raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult)
         print 'Released context.'
 
 except:

Modified: trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py
===================================================================
--- trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py	2009-04-18 08:07:15 UTC (rev 283)
+++ trunk/pyscard/src/smartcard/Examples/scard-api/sample_pinpad.py	2009-06-08 13:28:49 UTC (rev 284)
@@ -62,7 +62,7 @@
 try:
     hresult, hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
     if hresult!=0:
-        raise  'Failed to establish context: ' + SCardGetErrorMessage(hresult)
+        raise error, 'Failed to establish context: ' + SCardGetErrorMessage(hresult)
     print 'Context established!'
 
     try:
@@ -111,7 +111,7 @@
     finally:
         hresult = SCardReleaseContext( hcontext )
         if hresult!=SCARD_S_SUCCESS:
-            raise  'Failed to release context: ' + SCardGetErrorMessage(hresult)
+            raise error, 'Failed to release context: ' + SCardGetErrorMessage(hresult)
         print 'Released context.'
 
 except:


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