From 80887ffd9c2e11dbbab0790b7dec5086a2b7d50a Mon Sep 17 00:00:00 2001 From: Ilan Date: Thu, 16 Jul 2015 15:54:38 +0200 Subject: [PATCH] Django 1.7 doesn't like argparse for management commands. Changed to optparse for compatibility --- django_q/management/commands/qcluster.py | 18 ++++++++++++------ django_q/management/commands/qmonitor.py | 15 +++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/django_q/management/commands/qcluster.py b/django_q/management/commands/qcluster.py index 0e4e821..2479386 100644 --- a/django_q/management/commands/qcluster.py +++ b/django_q/management/commands/qcluster.py @@ -1,5 +1,8 @@ +from optparse import make_option + from django.core.management.base import BaseCommand from django.utils.translation import ugettext as _ + from django_q.cluster import Cluster @@ -7,16 +10,19 @@ class Command(BaseCommand): # Translators: help text for qcluster management command help = _("Starts a Django Q Cluster.") + option_list = BaseCommand.option_list + ( + make_option('--run-once', + action='store_true', + dest='run_once', + default=False, + help='Run once and then stop.'), + ) + def add_arguments(self, parser): - parser.add_argument('--run-once', - action='store_true', - dest='run_once', - default=False, - help='Run once and then stop.') + parser.add_argument('poll_id', nargs='+', type=int) def handle(self, *args, **options): q = Cluster() q.start() if options.get('run_once', False): q.stop() - diff --git a/django_q/management/commands/qmonitor.py b/django_q/management/commands/qmonitor.py index def5065..570a3ba 100644 --- a/django_q/management/commands/qmonitor.py +++ b/django_q/management/commands/qmonitor.py @@ -1,4 +1,6 @@ # Django +from optparse import make_option + from django.core.management.base import BaseCommand from django.utils.translation import ugettext as _ @@ -9,12 +11,13 @@ class Command(BaseCommand): # Translators: help text for qmonitor management command help = _("Monitors Q Cluster activity") - def add_arguments(self, parser): - parser.add_argument('--run-once', - action='store_true', - dest='run_once', - default=False, - help='Run once and then exit.') + option_list = BaseCommand.option_list + ( + make_option('--run-once', + action='store_true', + dest='run_once', + default=False, + help='Run once and then stop.'), + ) def handle(self, *args, **options): monitor(run_once=options.get('run_once', False))