diff options
Diffstat (limited to 'django/contrib/admin')
| -rw-r--r-- | django/contrib/admin/filters.py | 5 | ||||
| -rw-r--r-- | django/contrib/admin/options.py | 14 | ||||
| -rw-r--r-- | django/contrib/admin/views/main.py | 6 |
3 files changed, 12 insertions, 13 deletions
diff --git a/django/contrib/admin/filters.py b/django/contrib/admin/filters.py index 9c5fbf7d8c..5f9d69dee4 100644 --- a/django/contrib/admin/filters.py +++ b/django/contrib/admin/filters.py @@ -166,9 +166,8 @@ class RelatedFieldListFilter(FieldListFilter): rel_name = other_model._meta.pk.name self.lookup_kwarg = '%s__%s__exact' % (field_path, rel_name) 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) self.lookup_choices = field.get_choices(include_blank=False) super(RelatedFieldListFilter, self).__init__( field, request, params, model, model_admin, field_path) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index e27672773c..6d3195a868 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1198,9 +1198,9 @@ class ModelAdmin(BaseModelAdmin): self.message_user(request, _( 'The %(name)s "%(obj)s" was deleted successfully.') % { - 'name': force_text(opts.verbose_name), - 'obj': force_text(obj_display)}, - messages.SUCCESS) + 'name': force_text(opts.verbose_name), + 'obj': force_text(obj_display) + }, messages.SUCCESS) if self.has_change_permission(request, None): post_url = reverse('admin:%s_%s_changelist' % @@ -1221,10 +1221,10 @@ class ModelAdmin(BaseModelAdmin): return TemplateResponse(request, self.delete_confirmation_template or [ - "admin/{}/{}/delete_confirmation.html".format(app_label, opts.model_name), - "admin/{}/delete_confirmation.html".format(app_label), - "admin/delete_confirmation.html" - ], context, current_app=self.admin_site.name) + "admin/{}/{}/delete_confirmation.html".format(app_label, opts.model_name), + "admin/{}/delete_confirmation.html".format(app_label), + "admin/delete_confirmation.html" + ], context, current_app=self.admin_site.name) @csrf_protect_m @transaction.atomic diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index dbe59f831b..04977eeef8 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -49,9 +49,9 @@ def _is_changelist_popup(request): IS_LEGACY_POPUP_VAR = 'pop' if IS_LEGACY_POPUP_VAR in request.GET: warnings.warn( - "The `%s` GET parameter has been renamed to `%s`." % - (IS_LEGACY_POPUP_VAR, IS_POPUP_VAR), - DeprecationWarning, 2) + "The `%s` GET parameter has been renamed to `%s`." % + (IS_LEGACY_POPUP_VAR, IS_POPUP_VAR), + DeprecationWarning, 2) return True return False |