Merge lp:~javier.collado/checkbox-core/staticmethods into lp:checkbox-core

[Javier Collado]

Those class methods that didn't actually used the cls parameter, have been changed to be static methods.

[Marc Tardif (cr3)]

This is definately in the right direction where I would eventually like to see class methods replaced with static methods, and static methods replaced by functions. This would be consistent with what Guido said [1]: Ironically, there are now no known uses for class methods in the Python distribution (other than in the test suite). I might even get rid of classmethod in a future release if no good use for it can be found!

However, these changes should not be done systematically; if a class method doesn't happen to use the class argument, that doesn't necessarily mean it makes sense to make it a function. So, some class methods might make more sense to be expressed as just methods whereas others as functions.

1. http://www.python.org/download/releases/2.2/descrintro/

review: Approve

=== modified file 'checkbox/journal/multi.py'
--- checkbox/journal/multi.py	2012-04-23 19:36:19 +0000
+++ checkbox/journal/multi.py	2012-04-24 13:33:32 +0000
@@ -54,8 +54,8 @@
 
 class Multi:
 
-    @classmethod
-    def truncateFilenames(cls, filenames):
+    @staticmethod
+    def truncateFilenames(filenames):
         """Static method to truncate the given journal files to zero length."""
         for filename in filenames:
             if os.acess(filename, os.F_OK):
@@ -67,8 +67,8 @@
                     if fd_close(fd) == -1:
                         logging.info("Can't close %s", filename)
 
-    @classmethod
-    def filenameToLogicalLines(cls, filename):
+    @staticmethod
+    def filenameToLogicalLines(filename):
         """Static method to read the specified file, break it into lines,
         and combine them into logical lines.
 
@@ -171,8 +171,8 @@
 
         return journal
 
-    @classmethod
-    def loadFilenamesFromStoreSubmitFilename(cls, submit_filename, directory):
+    @staticmethod
+    def loadFilenamesFromStoreSubmitFilename(submit_filename, directory):
         """ Gets the journal files from a stored submit file.
 
         :param submit_filename: The submit file name.
@@ -293,8 +293,8 @@
 
         return list(values)
 
-    @classmethod
-    def _getParamFromSubmitLine(cls, line, param):
+    @staticmethod
+    def _getParamFromSubmitLine(line, param):
         lexer = Lexer(line)
         token = Token()
 
 
=== modified file 'checkbox/message/signal.py'
--- checkbox/message/signal.py	2012-04-23 19:36:19 +0000
+++ checkbox/message/signal.py	2012-04-24 13:33:32 +0000
@@ -29,8 +29,8 @@
 
 class Signal:
 
-    @classmethod
-    def find(cls, record, name, default=-1):
+    @staticmethod
+    def find(record, name, default=-1):
         if not record:
             return -1
 
 
=== modified file 'checkbox/process/args.py'
--- checkbox/process/args.py	2012-04-23 19:36:19 +0000
+++ checkbox/process/args.py	2012-04-24 13:33:32 +0000
@@ -50,8 +50,8 @@
         else:
             return True
 
-    @classmethod
-    def quotedToRaw(cls, quoted):
+    @staticmethod
+    def quotedToRaw(quoted):
         if not quoted:
             return True
 
@@ -98,8 +98,8 @@
 
         return raw
 
-    @classmethod
-    def argToRaw(cls, arg, raw=""):
+    @staticmethod
+    def argToRaw(arg, raw=""):
         if raw:
             raw += " "
 
@@ -136,8 +136,8 @@
 
         return raw
 
-    @classmethod
-    def splitRaw(cls, raw, args):
+    @staticmethod
+    def splitRaw(raw, args):
         if not raw:
             return True
 
 
=== modified file 'checkbox/process/env.py'
--- checkbox/process/env.py	2012-04-23 19:36:19 +0000
+++ checkbox/process/env.py	2012-04-24 13:33:32 +0000
@@ -93,6 +93,6 @@
         else:
             return True
 
-    @classmethod
-    def quotedToRaw(cls, quoted):
+    @staticmethod
+    def quotedToRaw(quoted):
         return Args.quotedToRaw(quoted)