Ask Solem 12 years ago
parent
commit
cd873309f7

+ 1 - 0
celery/app/control.py

@@ -86,6 +86,7 @@ class Inspect(object):
     def conf(self):
         return self._request('dump_conf')
 
+
 class Control(object):
     Mailbox = Mailbox
 

+ 0 - 1
celery/app/log.py

@@ -121,7 +121,6 @@ class Logging(object):
             # then setup the root task logger.
             self.setup_task_loggers(loglevel, logfile, colorize=colorize)
 
-
         # This is a hack for multiprocessing's fork+exec, so that
         # logging before Process.run works.
         logfile_name = logfile if isinstance(logfile, basestring) else ''

+ 1 - 1
celery/backends/amqp.py

@@ -158,7 +158,7 @@ class AMQPBackend(BaseDictBackend):
             binding = self._create_binding(task_id)(channel)
             binding.declare()
             prev = latest = acc = None
-            for i in xrange(backlog_limit):  ## spool ffwd
+            for i in xrange(backlog_limit):  # spool ffwd
                 prev, latest, acc = latest, acc, binding.get(no_ack=False)
                 if not acc:  # no more messages
                     break

+ 1 - 1
celery/events/dumper.py

@@ -96,7 +96,7 @@ def evdump(app=None, out=sys.stdout):
             recv.capture()
         except (KeyboardInterrupt, SystemExit):
             return conn and conn.close()
-        except conn.connection_errors + conn.channel_errors as exc:
+        except conn.connection_errors + conn.channel_errors:
             dumper.say('-> Connection lost, attempting reconnect')
 
 if __name__ == '__main__':  # pragma: no cover

+ 4 - 2
celery/task/trace.py

@@ -230,7 +230,7 @@ def build_tracer(name, task, loader=None, hostname=None, store_errors=True,
                 except Ignore, exc:
                     I, R = Info(IGNORED, exc), ExceptionInfo(internal=True)
                     state, retval = I.state, I.retval
-                except RetryTaskError,  exc:
+                except RetryTaskError, exc:
                     I = Info(RETRY, exc)
                     state, retval = I.state, I.retval
                     R = I.handle_error_state(task, eager=eager)
@@ -271,7 +271,9 @@ def build_tracer(name, task, loader=None, hostname=None, store_errors=True,
                     if task_request.chord:
                         on_chord_part_return(task)
                     if task_after_return:
-                        task_after_return(state, retval, uuid, args, kwargs, None)
+                        task_after_return(
+                            state, retval, uuid, args, kwargs, None,
+                        )
                     if postrun_receivers:
                         send_postrun(sender=task, task_id=uuid, task=task,
                                      args=args, kwargs=kwargs,

+ 1 - 1
celery/utils/__init__.py

@@ -208,7 +208,7 @@ def jsonify(obj):
     elif isinstance(obj, (tuple, list)):
         return map(jsonify, obj)
     elif isinstance(obj, dict):
-        return dict([(k,jsonify(v)) for k,v in obj.iteritems()])
+        return dict((k, jsonify(v)) for k, v in obj.iteritems())
     # See "Date Time String Format" in the ECMA-262 specification.
     elif isinstance(obj, datetime.datetime):
         r = obj.isoformat()