Ask Solem 12 years ago
parent
commit
ac0cc078d7
4 changed files with 5 additions and 19 deletions
  1. 2 2
      celery/app/utils.py
  2. 3 1
      celery/bin/celery.py
  3. 0 5
      celery/events/__init__.py
  4. 0 11
      celery/events/state.py

+ 2 - 2
celery/app/utils.py

@@ -14,8 +14,8 @@ import types
 
 try:
     from billiard import forking as _forking
-except ImportError:  # noqa
-    _forking = None
+except ImportError:  # pragma: no cover
+    _forking = None  # noqa
 
 from celery import platforms
 from celery.five import items

+ 3 - 1
celery/bin/celery.py

@@ -89,7 +89,9 @@ class multi(Command):
     def run_from_argv(self, prog_name, argv, command=None):
         from celery.bin.multi import MultiTool
         argv.append("--cmd=%s worker --detach" % prog_name)
-        return MultiTool().execute_from_commandline([command] + argv, prog_name)
+        return MultiTool().execute_from_commandline(
+            [command] + argv, prog_name,
+        )
 
 
 class list_(Command):

+ 0 - 5
celery/events/__init__.py

@@ -288,11 +288,6 @@ class EventReceiver(ConsumerMixin):
     def itercapture(self, limit=None, timeout=None, wakeup=True):
         return self.consume(limit=limit, timeout=timeout, wakeup=wakeup)
 
-    def itercapture(self, limit=None, timeout=None, wakeup=True):
-        with self.consumer(wakeup=wakeup) as consumer:
-            yield consumer
-            self.drain_events(limit=limit, timeout=timeout)
-
     def capture(self, limit=None, timeout=None, wakeup=True):
         """Open up a consumer capturing events.
 

+ 0 - 11
celery/events/state.py

@@ -449,15 +449,4 @@ class State(object):
     def __setstate__(self, state):
         self.__dict__ = state
         self._mutex = threading.Lock()
-
-    def __getstate__(self):
-        d = dict(vars(self))
-        d.pop('_mutex')
-        return d
-
-    def __setstate__(self, state):
-        self.__dict__ = state
-        self._mutex = threading.Lock()
-
-
 state = State()