diff --git a/README.rst b/README.rst index 5da5d96c..9296669a 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ Looking for sponsor for working on django 1.11 to 2.2 support https://github.com .. image:: https://user-images.githubusercontent.com/26336/59113881-917c5180-890b-11e9-9863-f5a98d0e235e.png -:Version: 3.3.0 +:Version: 3.3.1 :Web: http://celeryproject.org/ :Download: http://pypi.python.org/pypi/django-celery/ :Source: http://github.com/celery/django-celery/ diff --git a/djcelery/management/commands/celery.py b/djcelery/management/commands/celery.py index 0ecafa29..0ee878d8 100644 --- a/djcelery/management/commands/celery.py +++ b/djcelery/management/commands/celery.py @@ -11,10 +11,11 @@ class Command(CeleryCommand): """The celery command.""" help = 'celery commands, see celery help' - cc_options = CeleryCommand.options if CeleryCommand.options else [] - base_options = base.get_options() if base.get_options() else [] - preload_options = getattr(base, 'preload_options', []) or [] - options = cc_options + base_options + preload_options + options = ( + tuple(CeleryCommand.options) + + tuple(base.get_options()) + + tuple(getattr(base, 'preload_options', ())) + ) def run_from_argv(self, argv): argv = self.handle_default_options(argv) diff --git a/djcelery/management/commands/celerybeat.py b/djcelery/management/commands/celerybeat.py index 53b27f4a..8c9580a4 100644 --- a/djcelery/management/commands/celerybeat.py +++ b/djcelery/management/commands/celerybeat.py @@ -16,9 +16,11 @@ class Command(CeleryCommand): """Run the celery periodic task scheduler.""" help = 'Old alias to the "celery beat" command.' - options = CeleryCommand.options - options += beat.get_options() - options += beat.preload_options + options = ( + tuple(CeleryCommand.options) + + tuple(beat.get_options()) + + tuple(getattr(beat, 'preload_options', ())) + ) def handle(self, *args, **options): beat.run(*args, **options) diff --git a/djcelery/management/commands/celerycam.py b/djcelery/management/commands/celerycam.py index 6afa9117..a22cdd4c 100644 --- a/djcelery/management/commands/celerycam.py +++ b/djcelery/management/commands/celerycam.py @@ -16,9 +16,11 @@ class Command(CeleryCommand): """Run the celery curses event viewer.""" help = 'Takes snapshots of the clusters state to the database.' - options = CeleryCommand.options - options += ev.get_options() - options += ev.preload_options + options = ( + tuple(CeleryCommand.options) + + tuple(ev.get_options()) + + tuple(getattr(ev, 'preload_options', ())) + ) def handle(self, *args, **options): """Handle the management command.""" diff --git a/djcelery/management/commands/celeryd.py b/djcelery/management/commands/celeryd.py index 094ba032..8fd1820c 100644 --- a/djcelery/management/commands/celeryd.py +++ b/djcelery/management/commands/celeryd.py @@ -16,9 +16,11 @@ class Command(CeleryCommand): """Run the celery daemon.""" help = 'Old alias to the "celery worker" command.' - options = CeleryCommand.options - options += worker.get_options() - options += worker.preload_options + options = ( + tuple(CeleryCommand.options) + + tuple(worker.get_options()) + + tuple(getattr(worker, 'preload_options', ())) + ) def handle(self, *args, **options): worker.check_args(args) diff --git a/djcelery/management/commands/celerymon.py b/djcelery/management/commands/celerymon.py index b4f33590..bf2fbfde 100644 --- a/djcelery/management/commands/celerymon.py +++ b/djcelery/management/commands/celerymon.py @@ -31,8 +31,13 @@ class Command(CeleryCommand): """Run the celery monitor.""" help = 'Run the celery monitor' - options = CeleryCommand.options - options += (mon and mon.get_options() + mon.preload_options or ()) + options = ( + tuple(CeleryCommand.options) + + ( + tuple(mon.get_options()) + + tuple(getattr(mon, 'preload_options', ())) + ) if mon else () + ) def handle(self, *args, **options): """Handle the management command.""" diff --git a/djcelery/management/commands/djcelerymon.py b/djcelery/management/commands/djcelerymon.py index 45034155..d12d368b 100644 --- a/djcelery/management/commands/djcelerymon.py +++ b/djcelery/management/commands/djcelerymon.py @@ -32,9 +32,11 @@ def run(self): class Command(CeleryCommand): """Run the celery curses event viewer.""" args = '[optional port number, or ipaddr:port]' - options = runserver.Command.option_list - options += ev.get_options() - options += ev.preload_options + options = ( + tuple(runserver.Command.option_list) + + tuple(ev.get_options()) + + tuple(getattr(ev, 'preload_options', ())) + ) help = 'Starts Django Admin instance and celerycam in the same process.' # see http://code.djangoproject.com/changeset/13319. diff --git a/docs/introduction.rst b/docs/introduction.rst index 47346ecb..82aa34e1 100644 --- a/docs/introduction.rst +++ b/docs/introduction.rst @@ -4,7 +4,7 @@ .. image:: http://cloud.github.com/downloads/celery/celery/celery_128.png -:Version: 3.3.0 +:Version: 3.3.1 :Web: http://celeryproject.org/ :Download: http://pypi.python.org/pypi/django-celery/ :Source: http://github.com/celery/django-celery/