Browse Source

PEP8ify + pyflakes

Ask Solem 13 years ago
parent
commit
53a73541e1

+ 3 - 2
celery/backends/cassandra.py

@@ -106,8 +106,9 @@ class CassandraBackend(BaseDictBackend):
 
     def _get_column_family(self):
         if self._column_family is None:
-            conn = pycassa.ConnectionPool(self.keyspace, server_list=self.servers,
-                                   **self.cassandra_options)
+            conn = pycassa.ConnectionPool(self.keyspace,
+                                          server_list=self.servers,
+                                          **self.cassandra_options)
             self._column_family = \
               pycassa.ColumnFamily(conn, self.column_family,
                     read_consistency_level=self.read_consistency,

+ 2 - 3
celery/bin/celeryctl.py

@@ -5,7 +5,6 @@ from __future__ import with_statement
 if __name__ == "__main__" and __package__ is None:
     __package__ = "celery.bin.celeryctl"
 
-import os
 import sys
 
 from optparse import OptionParser, make_option as Option
@@ -16,7 +15,7 @@ from anyjson import deserialize
 
 from .. import __version__
 from ..app import app_or_default, current_app
-from ..platforms import EX_OK, EX_FAILURE, EX_UNAVAILABLE
+from ..platforms import EX_OK, EX_FAILURE, EX_UNAVAILABLE, EX_USAGE
 from ..utils import term
 from ..utils.timeutils import maybe_iso8601
 
@@ -360,7 +359,7 @@ class help(Command):
                          "commands": "\n".join(indent(command)
                                              for command in sorted(commands))})
 
-        return os.EX_USAGE
+        return EX_USAGE
 help = command(help)
 
 

+ 1 - 0
celery/loaders/default.py

@@ -12,6 +12,7 @@
 from __future__ import absolute_import
 
 import os
+import sys
 import warnings
 
 from ..datastructures import AttributeDict

+ 1 - 0
celery/platforms.py

@@ -31,6 +31,7 @@ grp = try_import("grp")
 EX_OK = getattr(os, "EX_OK", 0)
 EX_FAILURE = 1
 EX_UNAVAILABLE = getattr(os, "EX_UNAVAILABLE", 69)
+EX_USAGE = getattr(os, "EX_USAGE", 64)
 
 try:
     from multiprocessing.process import current_process

+ 0 - 1
celery/utils/__init__.py

@@ -434,7 +434,6 @@ def uniq(it):
             seen.add(obj)
 
 
-
 def maybe_reraise():
     """Reraise if an exception is currently being handled, or return
     otherwise."""