Commit 4157c502 authored by Piotr Jakimiak's avatar Piotr Jakimiak
Browse files

Removed unnecessary arguments in .get method calls

parent f61c4f49

django/contrib/admin/filters.py

+5 −6
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ class SimpleListFilter(ListFilter): 
        query string for this filter, if any. If the value wasn't provided then

        returns None.

        """

        return self.used_parameters.get(self.parameter_name, None)

        return self.used_parameters.get(self.parameter_name)



    def lookups(self, request, model_admin):

        """
@@ -220,8 +220,8 @@ class BooleanFieldListFilter(FieldListFilter): 
    def __init__(self, field, request, params, model, model_admin, field_path):

        self.lookup_kwarg = '%s__exact' % field_path

        self.lookup_kwarg2 = '%s__isnull' % field_path

        self.lookup_val = request.GET.get(self.lookup_kwarg, None)

        self.lookup_val2 = request.GET.get(self.lookup_kwarg2, None)

        self.lookup_val = request.GET.get(self.lookup_kwarg)

        self.lookup_val2 = request.GET.get(self.lookup_kwarg2)

        super(BooleanFieldListFilter, self).__init__(field,

            request, params, model, model_admin, field_path)
@@ -350,9 +350,8 @@ class AllValuesFieldListFilter(FieldListFilter): 
    def __init__(self, field, request, params, model, model_admin, field_path):

        self.lookup_kwarg = field_path

        self.lookup_kwarg_isnull = '%s__isnull' % field_path

        self.lookup_val = request.GET.get(self.lookup_kwarg, None)

        self.lookup_val_isnull = request.GET.get(self.lookup_kwarg_isnull,

                                                 None)

        self.lookup_val = request.GET.get(self.lookup_kwarg)

        self.lookup_val_isnull = request.GET.get(self.lookup_kwarg_isnull)

        parent_model, reverse_path = reverse_field_path(model, field_path)

        # Obey parent ModelAdmin queryset when deciding which options to show

        if model == parent_model:

django/contrib/admin/options.py

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)): 
        ordering.  Otherwise don't specify the queryset, let the field decide

        (returns None in that case).

        """

        related_admin = self.admin_site._registry.get(db_field.remote_field.model, None)

        related_admin = self.admin_site._registry.get(db_field.remote_field.model)

        if related_admin is not None:

            ordering = related_admin.get_ordering(request)

            if ordering is not None and ordering != ():

django/contrib/auth/forms.py

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ class UserChangeForm(forms.ModelForm): 


    def __init__(self, *args, **kwargs):

        super(UserChangeForm, self).__init__(*args, **kwargs)

        f = self.fields.get('user_permissions', None)

        f = self.fields.get('user_permissions')

        if f is not None:

            f.queryset = f.queryset.select_related('content_type')

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ class Command(BaseCommand): 
        return super(Command, self).execute(*args, **options)



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

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

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

        database = options.get('database')



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

django/contrib/flatpages/forms.py

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ class FlatpageForm(forms.ModelForm): 
        return url



    def clean(self):

        url = self.cleaned_data.get('url', None)

        sites = self.cleaned_data.get('sites', None)

        url = self.cleaned_data.get('url')

        sites = self.cleaned_data.get('sites')



        same_url = FlatPage.objects.filter(url=url)

        if self.instance.pk: