From c6425aafa58867d90ae11e7420bd6ba90693dd88 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sat, 10 Mar 2012 17:50:59 +0000 Subject: [PATCH] Fixed #17820 -- Fixed more occurrences of redundant handling of management commands options. They had been missen in the first attempts or had been introduced afterwards. Refs #13760, #10080, #17799. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17678 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/management/commands/createcachetable.py | 2 +- django/core/management/commands/reset.py | 2 +- django/core/management/commands/runserver.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/django/core/management/commands/createcachetable.py b/django/core/management/commands/createcachetable.py index 08fa5f2c3d..7164d1aa76 100644 --- a/django/core/management/commands/createcachetable.py +++ b/django/core/management/commands/createcachetable.py @@ -20,7 +20,7 @@ class Command(LabelCommand): requires_model_validation = False def handle_label(self, tablename, **options): - db = options.get('database', DEFAULT_DB_ALIAS) + db = options.get('database') cache = BaseDatabaseCache(tablename, {}) if not router.allow_syncdb(db, cache.cache_model_class): return diff --git a/django/core/management/commands/reset.py b/django/core/management/commands/reset.py index 9539212f48..e45edb70d8 100644 --- a/django/core/management/commands/reset.py +++ b/django/core/management/commands/reset.py @@ -25,7 +25,7 @@ class Command(AppCommand): 'This command has been deprecated. The command ``flush`` can be used to delete everything. You can also use ALTER TABLE or DROP TABLE statements manually.', DeprecationWarning ) - using = options.get('database', DEFAULT_DB_ALIAS) + using = options.get('database') connection = connections[using] app_name = app.__name__.split('.')[-2] diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py index fa11f93745..e93af96286 100644 --- a/django/core/management/commands/runserver.py +++ b/django/core/management/commands/runserver.py @@ -72,7 +72,7 @@ class BaseRunserverCommand(BaseCommand): """ Runs the server, using the autoreloader if needed """ - use_reloader = options.get('use_reloader', True) + use_reloader = options.get('use_reloader') if use_reloader: autoreload.main(self.inner_run, args, options) @@ -83,7 +83,7 @@ class BaseRunserverCommand(BaseCommand): from django.conf import settings from django.utils import translation - threading = options.get('use_threading', False) + threading = options.get('use_threading') shutdown_message = options.get('shutdown_message', '') quit_command = (sys.platform == 'win32') and 'CTRL-BREAK' or 'CONTROL-C'