Skip to content

Commit 79d9689

Browse files
Stranger6667auvipy
authored andcommitted
Fix Django 1.10+ (#464)
1 parent e1baac0 commit 79d9689

File tree

3 files changed

+39
-0
lines changed

3 files changed

+39
-0
lines changed

djcelery/management/base.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ def add_arguments(self, parser):
7070
if v is not None}
7171
flags = (option.get("_long_opts", []) +
7272
option.get("_short_opts", []))
73+
if option.get('default') == ('NO', 'DEFAULT'):
74+
option['default'] = None
7375
del option["_long_opts"]
7476
del option["_short_opts"]
7577
if "type" in option:

djcelery/tests/_compat.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# coding: utf-8
2+
3+
try:
4+
from unittest.mock import patch
5+
except ImportError:
6+
from mock import patch # noqa

djcelery/tests/test_commands.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# coding: utf-8
2+
from django import VERSION
3+
from django.core.management import call_command
4+
5+
from ._compat import patch
6+
7+
8+
CELERYD_COMMAND = 'djcelery.management.commands.celeryd.Command.handle'
9+
10+
11+
def test_celeryd_command():
12+
if VERSION >= (1, 10):
13+
traceback = False
14+
else:
15+
traceback = None
16+
with patch(CELERYD_COMMAND) as handle:
17+
call_command('celeryd')
18+
handle.assert_called_with(
19+
autoreload=None, autoscale=None, beat=None, broker=None,
20+
concurrency=0, detach=None, exclude_queues=[], executable=None,
21+
gid=None, heartbeat_interval=None, hostname=None, include=[],
22+
logfile=None, loglevel='WARN', max_tasks_per_child=None,
23+
no_color=False, no_execv=False, optimization=None, pidfile=None,
24+
pool_cls='prefork', purge=False, pythonpath=None, queues=[],
25+
quiet=None, schedule_filename='celerybeat-schedule',
26+
scheduler_cls=None, send_events=False, settings=None,
27+
skip_checks=True, state_db=None, task_soft_time_limit=None,
28+
task_time_limit=None, traceback=traceback, uid=None, umask=None,
29+
verbosity=1, without_gossip=False, without_heartbeat=False,
30+
without_mingle=False, working_directory=None
31+
)

0 commit comments

Comments
 (0)