Cosmetics

celery/backends/mongodb.py

@@ -162,7 +162,7 @@ class MongoBackend(BaseDictBackend):
         taskmeta_collection = db[self.mongodb_taskmeta_collection]
         obj = taskmeta_collection.find_one({"_id": taskset_id})
         if not obj:
-            return None
+            return
 
         meta = {
             "task_id": obj["_id"],

celery/bin/celeryctl.py

@@ -386,7 +386,7 @@ class celeryctl(CeleryCommand):
 def determine_exit_status(ret):
     if isinstance(ret, int):
         return ret
-    return EX_OK if ret else W_FAILURE
+    return EX_OK if ret else EX_FAILURE
 
 
 def main():

celery/concurrency/gevent.py

@@ -109,15 +109,14 @@ class TaskPool(BasePool):
             accept_callback=None, **_):
         return self._pool.spawn(apply_target, target, args, kwargs,
                                 callback, accept_callback)
+
     def grow(self, n=1):
         self._pool._semaphore.counter += n
         self._pool.size += n
-        return None
 
     def shrink(self, n=1):
         self._pool._semaphore.counter -= n
         self._pool.size -= n
-        return None
 
     @property
     def num_processes(self):

celery/concurrency/processes/_win.py

@@ -45,7 +45,7 @@ def Process32First(hSnapshot):
     success = windll.kernel32.Process32First(hSnapshot, byref(pe))
     if not success:
         if windll.kernel32.GetLastError() == ERROR_NO_MORE_FILES:
-            return None
+            return
         raise WinError()
     return pe
 
@@ -57,7 +57,7 @@ def Process32Next(hSnapshot, pe=None):
     success = windll.kernel32.Process32Next(hSnapshot, byref(pe))
     if not success:
         if windll.kernel32.GetLastError() == ERROR_NO_MORE_FILES:
-            return None
+            return
         raise WinError()
     return pe
 

celery/contrib/abortable.py

@@ -42,7 +42,7 @@ In the consumer:
                        # Respect the aborted status and terminate
                        # gracefully
                        logger.warning("Task aborted.")
-                       return None
+                       return
                y = do_something_expensive(x)
                results.append(y)
            logger.info("Task finished.")

celery/db/a805d4bd.py

@@ -53,15 +53,13 @@ class PickleType(_PickleType):
 
             def process(value):
                 value = impl_processor(value)
-                if value is None:
-                    return None
-                return loads(value)
+                if value is not None:
+                    return loads(value)
         else:
 
             def process(value):  # noqa
-                if value is None:
-                    return None
-                return loads(value)
+                if value is not None:
+                    return loads(value)
         return process
 
     def copy_value(self, value):

celery/db/dfd042c7.py

@@ -17,15 +17,13 @@ class PickleType(_PickleType):
     def process_bind_param(self, value, dialect):
         dumps = self.pickler.dumps
         protocol = self.protocol
-        if value is None:
-            return None
-        return dumps(value, protocol)
+        if value is not None:
+            return dumps(value, protocol)
 
     def process_result_value(self, value, dialect):
         loads = self.pickler.loads
-        if value is None:
-            return None
-        return loads(str(value))
+        if value is not None:
+            return loads(str(value))
 
     def copy_value(self, value):
         if self.mutable:

celery/log.py

@@ -322,7 +322,7 @@ class LoggingProxy(object):
         return False
 
     def fileno(self):
-        return None
+        pass
 
 
 class SilenceRepeated(object):

celery/tests/compat.py

@@ -77,8 +77,6 @@ class catch_warnings(object):
 
             self._module.showwarning = showwarning
             return log
-        else:
-            return None
 
     def __exit__(self, *exc_info):
         if not self._entered:

celery/utils/dispatch/saferef.py

@@ -197,7 +197,6 @@ class BoundMethodWeakref(object):
             function = self.weak_func()
             if function is not None:
                 return function.__get__(target)
-        return None
 
 
 class BoundNonDescriptorMethodWeakref(BoundMethodWeakref):
@@ -268,7 +267,6 @@ class BoundNonDescriptorMethodWeakref(BoundMethodWeakref):
                 # arguments it supports, and pydispatcher needs this
                 # information.
                 return getattr(target, function.__name__)
-        return None
 
 
 def get_bound_method_weakref(target, on_delete):