flakes

celery · Apr 22, 2015 · 2abc5de · 2abc5de
1 parent 4381ba5
commit 2abc5de
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/celery/app/task.py b/celery/app/task.py
@@ -532,10 +532,10 @@ def apply_async(self, args=None, kwargs=None, task_id=None, producer=None,
             attribute.  Trailing can also be disabled by default using the
             :attr:`trail` attribute
         :keyword publisher: Deprecated alias to ``producer``.
-        
-        :rtype :class:`celery.result.AsyncResult`: if 
-            :setting:`CELERY_ALWAYS_EAGER` is not set, otherwise 
-            :class:`celery.result.EagerResult`:
+
+        :rtype :class:`celery.result.AsyncResult`: if
+            :setting:`CELERY_ALWAYS_EAGER` is not set, otherwise
+            :class:`celery.result.EagerResult`.
 
         Also supports all keyword arguments supported by
         :meth:`kombu.Producer.publish`.

diff --git a/celery/bin/base.py b/celery/bin/base.py
@@ -505,11 +505,7 @@ def parse_preload_options(self, args):
         return self.preparse_options(args, self.preload_options)
 
     def add_append_opt(self, acc, opt, value):
-        default = opt.default or []
-
-        if opt.dest not in acc:
-           acc[opt.dest] = default
-
+        acc.setdefault(opt.dest, opt.default or [])
         acc[opt.dest].append(value)
 
     def preparse_options(self, args, options):

diff --git a/celery/tests/fixups/test_django.py b/celery/tests/fixups/test_django.py
@@ -209,7 +209,7 @@ def test__close_database(self):
             conns[1].close.side_effect = KeyError('already closed')
             f.database_errors = (KeyError, )
 
-            f._db.connections = Mock() # ConnectionHandler
+            f._db.connections = Mock()  # ConnectionHandler
             f._db.connections.all.side_effect = lambda: conns
 
             f._close_database()