Commit 59c051d1 authored by Julien Phalip's avatar Julien Phalip
Browse files

Fixed #13760 -- Cleaned up unnecessary default option handling in a bunch of... 

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.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent adf51b0c

django/core/management/commands/createcachetable.py

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class Command(LabelCommand): 
    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.

django/core/management/commands/dbshell.py

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class Command(BaseCommand): 
    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:

django/core/management/commands/dumpdata.py

+7 −7
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ class Command(BaseCommand): 
    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()

django/core/management/commands/flush.py

+2 −2
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ class Command(NoArgsCommand): 
           '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()

django/core/management/commands/inspectdb.py

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class Command(NoArgsCommand): 
            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('-', '')