Author: julien
Date: 2011-10-22 20:43:43 -0700 (Sat, 22 Oct 2011)
New Revision: 17028
Modified:
django/trunk/django/core/management/commands/createcachetable.py
django/trunk/django/core/management/commands/dbshell.py
django/trunk/django/core/management/commands/dumpdata.py
django/trunk/django/core/management/commands/flush.py
django/trunk/django/core/management/commands/inspectdb.py
django/trunk/django/core/management/commands/loaddata.py
django/trunk/django/core/management/commands/runserver.py
django/trunk/django/core/management/commands/sql.py
django/trunk/django/core/management/commands/sqlall.py
django/trunk/django/core/management/commands/sqlclear.py
django/trunk/django/core/management/commands/sqlcustom.py
django/trunk/django/core/management/commands/sqlflush.py
django/trunk/django/core/management/commands/sqlindexes.py
django/trunk/django/core/management/commands/sqlreset.py
django/trunk/django/core/management/commands/sqlsequencereset.py
django/trunk/django/core/management/commands/syncdb.py
django/trunk/django/core/management/commands/test.py
django/trunk/django/core/management/commands/testserver.py
Log:
Fixed #13760 -- Cleaned up unnecessary default option handling in a bunch of
management commands. Thanks to Paul McMillan for the report and to adamv and
Claude Paroz for the patch.
Modified: django/trunk/django/core/management/commands/createcachetable.py
===================================================================
--- django/trunk/django/core/management/commands/createcachetable.py
2011-10-22 23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/createcachetable.py
2011-10-23 03:43:43 UTC (rev 17028)
@@ -18,7 +18,7 @@
requires_model_validation = False
def handle_label(self, tablename, **options):
- alias = options.get('database', DEFAULT_DB_ALIAS)
+ alias = options.get('database')
connection = connections[alias]
fields = (
# "key" is a reserved word in MySQL, so use "cache_key" instead.
Modified: django/trunk/django/core/management/commands/dbshell.py
===================================================================
--- django/trunk/django/core/management/commands/dbshell.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/dbshell.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -16,7 +16,7 @@
requires_model_validation = False
def handle(self, **options):
- connection = connections[options.get('database', DEFAULT_DB_ALIAS)]
+ connection = connections[options.get('database')]
try:
connection.client.runshell()
except OSError:
Modified: django/trunk/django/core/management/commands/dumpdata.py
===================================================================
--- django/trunk/django/core/management/commands/dumpdata.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/dumpdata.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -30,13 +30,13 @@
def handle(self, *app_labels, **options):
from django.db.models import get_app, get_apps, get_model
- format = options.get('format','json')
- indent = options.get('indent',None)
- using = options.get('database', DEFAULT_DB_ALIAS)
- excludes = options.get('exclude',[])
- show_traceback = options.get('traceback', False)
- use_natural_keys = options.get('use_natural_keys', False)
- use_base_manager = options.get('use_base_manager', False)
+ format = options.get('format')
+ indent = options.get('indent')
+ using = options.get('database')
+ excludes = options.get('exclude')
+ show_traceback = options.get('traceback')
+ use_natural_keys = options.get('use_natural_keys')
+ use_base_manager = options.get('use_base_manager')
excluded_apps = set()
excluded_models = set()
Modified: django/trunk/django/core/management/commands/flush.py
===================================================================
--- django/trunk/django/core/management/commands/flush.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/flush.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -23,9 +23,9 @@
're-executed, and the initial_data fixture will be re-installed.')
def handle_noargs(self, **options):
- db = options.get('database', DEFAULT_DB_ALIAS)
+ db = options.get('database')
connection = connections[db]
- verbosity = int(options.get('verbosity', 1))
+ verbosity = int(options.get('verbosity'))
interactive = options.get('interactive')
self.style = no_style()
Modified: django/trunk/django/core/management/commands/inspectdb.py
===================================================================
--- django/trunk/django/core/management/commands/inspectdb.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/inspectdb.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -25,7 +25,7 @@
raise CommandError("Database inspection isn't supported for the
currently selected database backend.")
def handle_inspection(self, options):
- connection = connections[options.get('database', DEFAULT_DB_ALIAS)]
+ connection = connections[options.get('database')]
table2model = lambda table_name: table_name.title().replace('_',
'').replace(' ', '').replace('-', '')
Modified: django/trunk/django/core/management/commands/loaddata.py
===================================================================
--- django/trunk/django/core/management/commands/loaddata.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/loaddata.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -34,13 +34,13 @@
)
def handle(self, *fixture_labels, **options):
- using = options.get('database', DEFAULT_DB_ALIAS)
+ using = options.get('database')
connection = connections[using]
self.style = no_style()
- verbosity = int(options.get('verbosity', 1))
- show_traceback = options.get('traceback', False)
+ verbosity = int(options.get('verbosity'))
+ show_traceback = options.get('traceback')
# commit is a stealth option - it isn't really useful as
# a command line option, but it can be useful when invoking
Modified: django/trunk/django/core/management/commands/runserver.py
===================================================================
--- django/trunk/django/core/management/commands/runserver.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/runserver.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -139,4 +139,4 @@
Serves admin media like old-school (deprecation pending).
"""
handler = super(Command, self).get_handler(*args, **options)
- return AdminMediaHandler(handler, options.get('admin_media_path', ''))
+ return AdminMediaHandler(handler, options.get('admin_media_path'))
Modified: django/trunk/django/core/management/commands/sql.py
===================================================================
--- django/trunk/django/core/management/commands/sql.py 2011-10-22 23:39:09 UTC
(rev 17027)
+++ django/trunk/django/core/management/commands/sql.py 2011-10-23 03:43:43 UTC
(rev 17028)
@@ -16,4 +16,4 @@
output_transaction = True
def handle_app(self, app, **options):
- return u'\n'.join(sql_create(app, self.style,
connections[options.get('database', DEFAULT_DB_ALIAS)])).encode('utf-8')
+ return u'\n'.join(sql_create(app, self.style,
connections[options.get('database')])).encode('utf-8')
Modified: django/trunk/django/core/management/commands/sqlall.py
===================================================================
--- django/trunk/django/core/management/commands/sqlall.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/sqlall.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -16,4 +16,4 @@
output_transaction = True
def handle_app(self, app, **options):
- return u'\n'.join(sql_all(app, self.style,
connections[options.get('database', DEFAULT_DB_ALIAS)])).encode('utf-8')
+ return u'\n'.join(sql_all(app, self.style,
connections[options.get('database')])).encode('utf-8')
Modified: django/trunk/django/core/management/commands/sqlclear.py
===================================================================
--- django/trunk/django/core/management/commands/sqlclear.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/sqlclear.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -16,4 +16,4 @@
output_transaction = True
def handle_app(self, app, **options):
- return u'\n'.join(sql_delete(app, self.style,
connections[options.get('database', DEFAULT_DB_ALIAS)])).encode('utf-8')
+ return u'\n'.join(sql_delete(app, self.style,
connections[options.get('database')])).encode('utf-8')
Modified: django/trunk/django/core/management/commands/sqlcustom.py
===================================================================
--- django/trunk/django/core/management/commands/sqlcustom.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/sqlcustom.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -16,4 +16,4 @@
output_transaction = True
def handle_app(self, app, **options):
- return u'\n'.join(sql_custom(app, self.style,
connections[options.get('database', DEFAULT_DB_ALIAS)])).encode('utf-8')
+ return u'\n'.join(sql_custom(app, self.style,
connections[options.get('database')])).encode('utf-8')
Modified: django/trunk/django/core/management/commands/sqlflush.py
===================================================================
--- django/trunk/django/core/management/commands/sqlflush.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/sqlflush.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -16,4 +16,4 @@
output_transaction = True
def handle_noargs(self, **options):
- return u'\n'.join(sql_flush(self.style,
connections[options.get('database', DEFAULT_DB_ALIAS)],
only_django=True)).encode('utf-8')
+ return u'\n'.join(sql_flush(self.style,
connections[options.get('database')], only_django=True)).encode('utf-8')
Modified: django/trunk/django/core/management/commands/sqlindexes.py
===================================================================
--- django/trunk/django/core/management/commands/sqlindexes.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/sqlindexes.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -17,4 +17,4 @@
output_transaction = True
def handle_app(self, app, **options):
- return u'\n'.join(sql_indexes(app, self.style,
connections[options.get('database', DEFAULT_DB_ALIAS)])).encode('utf-8')
+ return u'\n'.join(sql_indexes(app, self.style,
connections[options.get('database')])).encode('utf-8')
Modified: django/trunk/django/core/management/commands/sqlreset.py
===================================================================
--- django/trunk/django/core/management/commands/sqlreset.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/sqlreset.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -17,4 +17,4 @@
output_transaction = True
def handle_app(self, app, **options):
- return u'\n'.join(sql_reset(app, self.style,
connections[options.get('database', DEFAULT_DB_ALIAS)])).encode('utf-8')
+ return u'\n'.join(sql_reset(app, self.style,
connections[options.get('database')])).encode('utf-8')
Modified: django/trunk/django/core/management/commands/sqlsequencereset.py
===================================================================
--- django/trunk/django/core/management/commands/sqlsequencereset.py
2011-10-22 23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/sqlsequencereset.py
2011-10-23 03:43:43 UTC (rev 17028)
@@ -16,5 +16,5 @@
output_transaction = True
def handle_app(self, app, **options):
- connection = connections[options.get('database', DEFAULT_DB_ALIAS)]
+ connection = connections[options.get('database')]
return u'\n'.join(connection.ops.sequence_reset_sql(self.style,
models.get_models(app, include_auto_created=True))).encode('utf-8')
Modified: django/trunk/django/core/management/commands/syncdb.py
===================================================================
--- django/trunk/django/core/management/commands/syncdb.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/syncdb.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -22,9 +22,9 @@
def handle_noargs(self, **options):
- verbosity = int(options.get('verbosity', 1))
+ verbosity = int(options.get('verbosity'))
interactive = options.get('interactive')
- show_traceback = options.get('traceback', False)
+ show_traceback = options.get('traceback')
# Stealth option -- 'load_initial_data' is used by the testing setup
# process to disable initial fixture loading.
@@ -51,7 +51,7 @@
if not msg.startswith('No module named') or 'management' not
in msg:
raise
- db = options.get('database', DEFAULT_DB_ALIAS)
+ db = options.get('database')
connection = connections[db]
cursor = connection.cursor()
Modified: django/trunk/django/core/management/commands/test.py
===================================================================
--- django/trunk/django/core/management/commands/test.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/test.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -46,9 +46,7 @@
from django.test.utils import get_runner
TestRunner = get_runner(settings, options.get('testrunner'))
- options['verbosity'] = int(options.get('verbosity', 1))
- options.setdefault('interactive', True)
- options.setdefault('failfast', False)
+ options['verbosity'] = int(options.get('verbosity'))
test_runner = TestRunner(**options)
failures = test_runner.run_tests(test_labels)
Modified: django/trunk/django/core/management/commands/testserver.py
===================================================================
--- django/trunk/django/core/management/commands/testserver.py 2011-10-22
23:39:09 UTC (rev 17027)
+++ django/trunk/django/core/management/commands/testserver.py 2011-10-23
03:43:43 UTC (rev 17028)
@@ -21,8 +21,8 @@
from django.core.management import call_command
from django.db import connection
- verbosity = int(options.get('verbosity', 1))
- interactive = options.get('interactive', True)
+ verbosity = int(options.get('verbosity'))
+ interactive = options.get('interactive')
addrport = options.get('addrport')
# Create a test database.
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
