diff options
| author | Tim Graham <timograham@gmail.com> | 2018-02-21 13:32:13 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-02-21 13:32:13 -0500 |
| commit | 16436f3751e9eec67a7b80b25c8e7d29a34be67e (patch) | |
| tree | 826b90c533ca808a2175d575aaae15ceef1fd62c | |
| parent | a94fd8a8d9ee02f4abd872fb2b7509c19ac5d44e (diff) | |
Removed unused opts argument from admin's get_deleted_objects().
Unused since e12b3199d0c01694ca6b09add5e0f27cadffc8ad.
| -rw-r--r-- | django/contrib/admin/actions.py | 3 | ||||
| -rw-r--r-- | django/contrib/admin/options.py | 5 | ||||
| -rw-r--r-- | django/contrib/admin/utils.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py index 49f969f668..319cb14307 100644 --- a/django/contrib/admin/actions.py +++ b/django/contrib/admin/actions.py @@ -33,7 +33,8 @@ def delete_selected(modeladmin, request, queryset): # Populate deletable_objects, a data structure of all related objects that # will also be deleted. deletable_objects, model_count, perms_needed, protected = get_deleted_objects( - queryset, opts, request.user, modeladmin.admin_site, using) + queryset, request.user, modeladmin.admin_site, using, + ) # The user has already confirmed the deletion. # Do the deletion and return None to display the change list view again. diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index de28525b78..369fba18e1 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1754,8 +1754,9 @@ class ModelAdmin(BaseModelAdmin): # Populate deleted_objects, a data structure of all related objects that # will also be deleted. - (deleted_objects, model_count, perms_needed, protected) = get_deleted_objects( - [obj], opts, request.user, self.admin_site, using) + deleted_objects, model_count, perms_needed, protected = get_deleted_objects( + [obj], request.user, self.admin_site, using, + ) if request.POST and not protected: # The user has confirmed the deletion. if perms_needed: diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index 1b1cff7ec8..633d4d69df 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -117,7 +117,7 @@ def flatten_fieldsets(fieldsets): return field_names -def get_deleted_objects(objs, opts, user, admin_site, using): +def get_deleted_objects(objs, user, admin_site, using): """ Find all objects related to ``objs`` that should also be deleted. ``objs`` must be a homogeneous iterable of objects (e.g. a QuerySet). |