Migrate to staticmethod decorators

src/smartcard/CardService.py

@@ -48,11 +48,10 @@ def __del__(self):
         """Destructor. Disconnect card and destroy card service resources."""
         self.connection.disconnect()
 
+    @staticmethod
     def supports(cardname):
         pass
 
-    supports = staticmethod(supports)
-
 
 if __name__ == "__main__":
     """Small sample illustrating the use of CardService."""

src/smartcard/PassThruCardService.py

@@ -40,14 +40,13 @@ def __init__(self, connection, cardname=None):
         """
         CardService.CardService.__init__(self, connection, cardname)
 
+    @staticmethod
     def supports(cardname):
         """Returns True if the cardname is supported by the card service.
         The PassThruCardService supports all cardnames and always
         returns True."""
         return True
 
-    supports = staticmethod(supports)
-
 
 if __name__ == "__main__":
     """Small sample illustrating the use of CardService."""

src/smartcard/pcsc/PCSCContext.py

@@ -61,6 +61,7 @@ def __getattr__(self, name):
         if self.instance:
             return getattr(self.instance, name)
 
+    @staticmethod
     def renewContext():
         PCSCContext.mutex.acquire()
         try:
@@ -72,5 +73,3 @@ def renewContext():
             PCSCContext.mutex.release()
 
         return PCSCContext.instance.getContext()
-
-    renewContext = staticmethod(renewContext)

src/smartcard/pcsc/PCSCReader.py

@@ -99,12 +99,11 @@ def createConnection(self):
         return CardConnectionDecorator(PCSCCardConnection(self.name))
 
     class Factory:
-
+        @staticmethod
         def create(readername):
             return PCSCReader(readername)
 
-        create = staticmethod(create)
-
+    @staticmethod
     def readers(groups=[]):
         creaders = []
         hcontext = PCSCContext().getContext()
@@ -119,8 +118,6 @@ def readers(groups=[]):
             creaders.append(PCSCReader.Factory.create(reader))
         return creaders
 
-    readers = staticmethod(readers)
-
 
 if __name__ == "__main__":
     from smartcard.util import *

src/smartcard/reader/ReaderFactory.py

@@ -41,6 +41,7 @@ class ReaderFactory:
     factorymethods = [PCSCReader.readers]
 
     # A Template Method:
+    @staticmethod
     def createReader(clazz, readername):
         """Static method to create a reader from a reader clazz.
 
@@ -51,12 +52,9 @@ def createReader(clazz, readername):
             ReaderFactory.factories[clazz] = get_class(clazz).Factory()
         return ReaderFactory.factories[clazz].create(readername)
 
-    createReader = staticmethod(createReader)
-
+    @staticmethod
     def readers(groups=[]):
         zreaders = []
         for fm in ReaderFactory.factorymethods:
             zreaders += fm(groups)
         return zreaders
-
-    readers = staticmethod(readers)