From d58c31e10351f4eb46e5d3a7e025bb4f58fb62e2 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Tue, 7 Jun 2016 16:43:51 +0200 Subject: [PATCH] Replaces optparse with argparse for commands --- django_q/management/commands/qcluster.py | 17 ++++++++--------- django_q/management/commands/qinfo.py | 18 ++++++++---------- django_q/management/commands/qmonitor.py | 17 ++++++++--------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/django_q/management/commands/qcluster.py b/django_q/management/commands/qcluster.py index 14e312c..b40267b 100644 --- a/django_q/management/commands/qcluster.py +++ b/django_q/management/commands/qcluster.py @@ -1,5 +1,3 @@ -from optparse import make_option - from django.core.management.base import BaseCommand from django.utils.translation import ugettext as _ @@ -10,13 +8,14 @@ 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.', + ) def handle(self, *args, **options): q = Cluster() diff --git a/django_q/management/commands/qinfo.py b/django_q/management/commands/qinfo.py index 84068fa..6647f4f 100644 --- a/django_q/management/commands/qinfo.py +++ b/django_q/management/commands/qinfo.py @@ -1,7 +1,4 @@ -from optparse import make_option - from django.core.management.base import BaseCommand - from django.utils.translation import ugettext as _ from django_q import VERSION @@ -13,13 +10,14 @@ class Command(BaseCommand): # Translators: help text for qinfo management command help = _('General information over all clusters.') - option_list = BaseCommand.option_list + ( - make_option('--config', - action='store_true', - dest='config', - default=False, - help='Print current configuration.'), - ) + def add_arguments(self, parser): + parser.add_argument( + '--config', + action='store_true', + dest='config', + default=False, + help='Print current configuration.', + ) def handle(self, *args, **options): if options.get('config', False): diff --git a/django_q/management/commands/qmonitor.py b/django_q/management/commands/qmonitor.py index bef4bd1..706f58e 100644 --- a/django_q/management/commands/qmonitor.py +++ b/django_q/management/commands/qmonitor.py @@ -1,5 +1,3 @@ -from optparse import make_option - from django.core.management.base import BaseCommand from django.utils.translation import ugettext as _ @@ -10,13 +8,14 @@ class Command(BaseCommand): # Translators: help text for qmonitor management command help = _("Monitors Q Cluster activity") - 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.', + ) def handle(self, *args, **options): monitor(run_once=options.get('run_once', False))