Merge branch 'master' of github.com:celery/celery

celery/bin/base.py

@@ -505,6 +505,14 @@ class Command(object):
     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[opt.dest].append(value)
+
     def preparse_options(self, args, options):
         acc = {}
         opts = {}
@@ -520,13 +528,19 @@ class Command(object):
                     key, value = arg.split('=', 1)
                     opt = opts.get(key)
                     if opt:
-                        acc[opt.dest] = value
+                        if opt.action == 'append':
+                            self.add_append_opt(acc, opt, value)
+                        else:
+                            acc[opt.dest] = value
                 else:
                     opt = opts.get(arg)
                     if opt and opt.takes_value():
                         # optparse also supports ['--opt', 'value']
                         # (Issue #1668)
-                        acc[opt.dest] = args[index + 1]
+                        if opt.action == 'append':
+                            self.add_append_opt(acc, opt, args[index + 1])
+                        else:
+                            acc[opt.dest] = args[index + 1]
                         index += 1
                     elif opt and opt.action == 'store_true':
                         acc[opt.dest] = True

celery/five.py

@@ -77,7 +77,7 @@ COMPAT_MODULES = {
         'log': {
             'get_default_logger': 'log.get_default_logger',
             'setup_logger': 'log.setup_logger',
-            'setup_loggig_subsystem': 'log.setup_logging_subsystem',
+            'setup_logging_subsystem': 'log.setup_logging_subsystem',
             'redirect_stdouts_to_logger': 'log.redirect_stdouts_to_logger',
         },
         'messaging': {

celery/tests/bin/test_base.py

@@ -314,3 +314,19 @@ class test_Command(AppCase):
         cmd.preload_options = (Option('-s', action='store', dest='silent'), )
         acc = cmd.parse_preload_options(['-s', 'yes'])
         self.assertEqual(acc.get('silent'), 'yes')
+
+    def test_parse_preload_options_with_equals_and_append(self):
+        cmd = Command()
+        opt = Option('--zoom', action='append', default=[])
+        cmd.preload_options = (opt,)
+        acc = cmd.parse_preload_options(['--zoom=1', '--zoom=2'])
+
+        self.assertEqual(acc, {'zoom': ['1', '2']})
+
+    def test_parse_preload_options_without_equals_and_append(self):
+        cmd = Command()
+        opt = Option('--zoom', action='append', default=[])
+        cmd.preload_options = (opt,)
+        acc = cmd.parse_preload_options(['--zoom', '1', '--zoom', '2'])
+
+        self.assertEqual(acc, {'zoom': ['1', '2']})

docs/userguide/signals.rst

@@ -81,7 +81,7 @@ Note that this is executed in the process sending the task.
 
 Sender is the name of the task being sent.
 
-Provides arguements:
+Provides arguments:
 
 * body