Commit 1845bc1d authored by Jon Dufresne's avatar Jon Dufresne Committed by Tim Graham
Browse files

Refs #26315 -- Cleaned up argparse options in commands. 

* Removed type coercion. Options created by argparse are already coerced
  to the correct type.
* Removed fallback default values. Options created by argparse already
  have a default value.
* Used direct indexing. Options created by argparse are always set. This
  eliminates the need to use dict.get().
parent 4115288b

django/contrib/auth/management/commands/changepassword.py

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class Command(BaseCommand): 
            help='Specifies the database to use. Default is "default".')



    def handle(self, *args, **options):

        if options.get('username'):

        if options['username']:

            username = options['username']

        else:

            username = getpass.getuser()
@@ -37,7 +37,7 @@ class Command(BaseCommand): 
        UserModel = get_user_model()



        try:

            u = UserModel._default_manager.using(options.get('database')).get(**{

            u = UserModel._default_manager.using(options['database']).get(**{

                UserModel.USERNAME_FIELD: username

            })

        except UserModel.DoesNotExist:

django/contrib/auth/management/commands/createsuperuser.py

+4 −4
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ class Command(BaseCommand): 
        return super(Command, self).execute(*args, **options)



    def handle(self, *args, **options):

        username = options.get(self.UserModel.USERNAME_FIELD)

        database = options.get('database')

        username = options[self.UserModel.USERNAME_FIELD]

        database = options['database']



        # If not provided, create the user with an unusable password

        password = None
@@ -72,7 +72,7 @@ class Command(BaseCommand): 
                username = self.username_field.clean(username, None)



                for field_name in self.UserModel.REQUIRED_FIELDS:

                    if options.get(field_name):

                    if options[field_name]:

                        field = self.UserModel._meta.get_field(field_name)

                        user_data[field_name] = field.clean(options[field_name], None)

                    else:
@@ -118,7 +118,7 @@ class Command(BaseCommand): 


                for field_name in self.UserModel.REQUIRED_FIELDS:

                    field = self.UserModel._meta.get_field(field_name)

                    user_data[field_name] = options.get(field_name)

                    user_data[field_name] = options[field_name]

                    while user_data[field_name] is None:

                        message = force_str('%s%s: ' % (

                            capfirst(field.verbose_name),

django/contrib/staticfiles/management/commands/runserver.py

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ class Command(RunserverCommand): 
        handler.

        """

        handler = super(Command, self).get_handler(*args, **options)

        use_static_handler = options.get('use_static_handler', True)

        insecure_serving = options.get('insecure_serving', False)

        use_static_handler = options['use_static_handler']

        insecure_serving = options['insecure_serving']

        if use_static_handler and (settings.DEBUG or insecure_serving):

            return StaticFilesHandler(handler)

        return handler

django/core/management/base.py

+2 −2
Original line number Diff line number Diff line
@@ -314,13 +314,13 @@ class BaseCommand(object): 
        controlled by the ``requires_system_checks`` attribute, except if

        force-skipped).

        """

        if options.get('no_color'):

        if options['no_color']:

            self.style = no_style()

            self.stderr.style_func = None

        if options.get('stdout'):

            self.stdout = OutputWrapper(options['stdout'])

        if options.get('stderr'):

            self.stderr = OutputWrapper(options.get('stderr'), self.stderr.style_func)

            self.stderr = OutputWrapper(options['stderr'], self.stderr.style_func)



        saved_locale = None

        if not self.leave_locale_alone:

django/core/management/commands/check.py

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class Command(BaseCommand): 


    def handle(self, *app_labels, **options):

        include_deployment_checks = options['deploy']

        if options.get('list_tags'):

        if options['list_tags']:

            self.stdout.write('\n'.join(sorted(registry.tags_available(include_deployment_checks))))

            return
@@ -42,7 +42,7 @@ class Command(BaseCommand): 
        else:

            app_configs = None



        tags = options.get('tags')

        tags = options['tags']

        if tags:

            try:

                invalid_tag = next(