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

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

Revision: 437
          http://pyscard.svn.sourceforge.net/pyscard/?rev=437&view=rev
Author:   ludov
Date:     2010-06-06 15:55:46 +0000 (Sun, 06 Jun 2010)

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

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/reader/Reader.py
    trunk/pyscard/src/smartcard/reader/ReaderFactory.py
    trunk/pyscard/src/smartcard/reader/ReaderGroups.py

Modified: trunk/pyscard/src/smartcard/reader/Reader.py
===================================================================
--- trunk/pyscard/src/smartcard/reader/Reader.py	2010-06-06 15:52:13 UTC (rev 436)
+++ trunk/pyscard/src/smartcard/reader/Reader.py	2010-06-06 15:55:46 UTC (rev 437)
@@ -22,6 +22,7 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 """
 
+
 class Reader:
     """Reader abstract class.
 
@@ -30,33 +31,34 @@
 
     Known subclasses: PCSCReader
     """
-    def __init__( self, readername ):
+
+    def __init__(self, readername):
         """Constructs a new reader and store readername."""
-        self.name=readername
+        self.name = readername
 
-    def addtoreadergroup( self, groupname ):
+    def addtoreadergroup(self, groupname):
         """Add reader to a reader group."""
         pass
 
-    def removefromreadergroup( self, groupname ):
+    def removefromreadergroup(self, groupname):
         """Remove reader from a reader group."""
         pass
 
-    def createConnection( self ):
+    def createConnection(self):
         """Returns a card connection thru reader."""
         pass
 
-    def __eq__( self, other ):
+    def __eq__(self, other):
         """Returns 0 if self==other (same name)."""
-        if type(other)==type(self):
-            return self.name==other.name
+        if type(other) == type(self):
+            return self.name == other.name
         else:
             return 1
 
-    def __repr__( self ):
+    def __repr__(self):
         """Returns card reader name string for `object` calls."""
         return "'%s'" % self.name
 
-    def __str__( self ):
+    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	2010-06-06 15:52:13 UTC (rev 436)
+++ trunk/pyscard/src/smartcard/reader/ReaderFactory.py	2010-06-06 15:55:46 UTC (rev 437)
@@ -32,17 +32,19 @@
 
 from smartcard.ClassLoader import get_class
 
+
 class ReaderFactory:
     """Class to create readers from reader type id."""
 
     factories = {}
-    def addFactory( id, ReaderFactory ):
+
+    def addFactory(id, ReaderFactory):
         """Static method to add a ReaderFactory associated to a reader id."""
         ReaderFactory.factories.put[id] = ReaderFactory
     addFactory = staticmethod(addFactory)
 
     # A Template Method:
-    def createReader( clazz, readername ):
+    def createReader(clazz, readername):
         """Static method to create a reader from a reader clazz.
 
         module:     the python module that contains the reader class
@@ -50,6 +52,6 @@
         readername: the reader name
         """
         if not ReaderFactory.factories.has_key(clazz):
-            ReaderFactory.factories[clazz] = get_class( clazz ).Factory()
-        return ReaderFactory.factories[clazz].create( readername )
+            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	2010-06-06 15:52:13 UTC (rev 436)
+++ trunk/pyscard/src/smartcard/reader/ReaderGroups.py	2010-06-06 15:55:46 UTC (rev 437)
@@ -25,16 +25,21 @@
 from smartcard.Exceptions import SmartcardException
 from smartcard.ulist import ulist
 
+
 class BadReaderGroupException(SmartcardException):
     """Raised when trying to add an invalid reader group."""
-    def __init__( self ):
-        SmartcardException.__init__( self, 'Invalid reader group' )
 
+    def __init__(self):
+        SmartcardException.__init__(self, 'Invalid reader group')
+
+
 class DeleteSCardDefaultReaderGroupException(SmartcardException):
     """Raised when trying to delete SCard$DefaultReaders reader group."""
-    def __init__( self ):
-        SmartcardException.__init__( self, 'SCard$DefaultReaders cannot be deleted' )
 
+    def __init__(self):
+        SmartcardException.__init__(self, 'SCard$DefaultReaders cannot be deleted')
+
+
 class innerreadergroups(ulist):
     """Smartcard readers groups private class.
 
@@ -42,49 +47,49 @@
     instance of this class.
     """
 
-    def __init__(self,  initlist=None ):
+    def __init__(self, initlist=None):
         """Retrieve and store list of reader groups"""
-        if None==initlist:
-            initlist=self.getreadergroups()
-        if None!=initlist:
-            ulist.__init__(self, initlist )
-        self.unremovablegroups=[]
+        if None == initlist:
+            initlist = self.getreadergroups()
+        if None != initlist:
+            ulist.__init__(self, initlist)
+        self.unremovablegroups = []
 
-
-    def __onadditem__( self, item ):
+    def __onadditem__(self, item):
         """Called when a reader group is added."""
-        self.addreadergroup( item )
+        self.addreadergroup(item)
 
-    def __onremoveitem__( self, item ):
+    def __onremoveitem__(self, item):
         """Called when a reader group is added."""
-        self.removereadergroup( item )
+        self.removereadergroup(item)
 
     #
     # abstract methods implemented in subclasses
     #
 
-    def getreadergroups( self ):
+    def getreadergroups(self):
         """Returns the list of smartcard reader groups."""
         return []
 
-    def addreadergroup( self, newgroup  ):
+    def addreadergroup(self, newgroup):
         """Add a reader group"""
-        if not isinstance( newgroup, type("") ):
+        if not isinstance(newgroup, type("")):
             raise BadReaderGroupException
 
-    def removereadergroup( self, group  ):
+    def removereadergroup(self, group):
         """Remove a reader group"""
-        if not isinstance( group, type("") ):
+        if not isinstance(group, type("")):
             raise BadReaderGroupException
 
-    def addreadertogroup( self, readername, groupname ):
+    def addreadertogroup(self, readername, groupname):
         """Add a reader to a reader group"""
         pass
 
-    def removereaderfromgroup( self, readername, groupname ):
+    def removereaderfromgroup(self, readername, groupname):
         """Remove a reader from a reader group"""
         pass
 
+
 class readergroups:
     """ReadersGroups organizes smart card reader as groups."""
 
@@ -92,11 +97,13 @@
     instance = None
 
     """Constructor: create a single instance of __readergroups on first call"""
-    def __init__(self, initlist=None ):
-        if None==readergroups.instance:
-            readergroups.instance = innerreadergroups( initlist )
 
+    def __init__(self, initlist=None):
+        if None == readergroups.instance:
+            readergroups.instance = innerreadergroups(initlist)
+
     """All operators redirected to inner class."""
+
     def __getattr__(self, name):
         return getattr(self.instance, name)
 


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