Ticket #16743: 16743-1.diff

django/core/management/commands/dumpdata.py

@@ -1 +1 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.core.management.base import BaseCommand, CommandError
-from django.core import serializers
-from django.db import router, DEFAULT_DB_ALIAS
 from django.utils.datastructures import SortedDict
 
 from optparse import make_option
@@ -13 +11 @@
         make_option('--indent', default=None, dest='indent', type='int',
             help='Specifies the indent level to use when pretty-printing output'),
         make_option('--database', action='store', dest='database',
-            default=DEFAULT_DB_ALIAS, help='Nominates a specific database to dump '
+            help='Nominates a specific database to dump '
                 'fixtures from. Defaults to the "default" database.'),
         make_option('-e', '--exclude', dest='exclude',action='append', default=[],
             help='An appname or appname.ModelName to exclude (use multiple --exclude to exclude multiple apps/models).'),
@@ -28 +26 @@
     args = '[appname appname.ModelName ...]'
 
     def handle(self, *app_labels, **options):
+        # Late imports to be able to get command help even when DATABASES
+        # setting contains errors
+        from django.core import serializers
         from django.db.models import get_app, get_apps, get_model
+        from django.db import router, DEFAULT_DB_ALIAS
 
         format = options.get('format')
         indent = options.get('indent')
-        using = options.get('database')
+        using = options.get('database', DEFAULT_DB_ALIAS)
         excludes = options.get('exclude')
         show_traceback = options.get('traceback')
         use_natural_keys = options.get('use_natural_keys')