From 47b35b1844b2adc167e64674824873991e9c4c2b Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 25 Feb 2015 07:15:56 -0500
Subject: [PATCH] Fixed #24411 -- Avoided dict key/method clash in admin delete
 views.

---
 django/contrib/admin/actions.py                               | 2 +-
 django/contrib/admin/options.py                               | 2 +-
 .../admin/templates/admin/includes/object_delete_summary.html | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py
index 3478145b30b..4445dd52fd0 100644
--- a/django/contrib/admin/actions.py
+++ b/django/contrib/admin/actions.py
@@ -68,7 +68,7 @@ def delete_selected(modeladmin, request, queryset):
         title=title,
         objects_name=objects_name,
         deletable_objects=[deletable_objects],
-        model_count=dict(model_count),
+        model_count=dict(model_count).items(),
         queryset=queryset,
         perms_lacking=perms_needed,
         protected=protected,
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 87c6d0093f4..2b1f5125b50 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1631,7 +1631,7 @@ class ModelAdmin(BaseModelAdmin):
             object_name=object_name,
             object=obj,
             deleted_objects=deleted_objects,
-            model_count=dict(model_count),
+            model_count=dict(model_count).items(),
             perms_lacking=perms_needed,
             protected=protected,
             opts=opts,
diff --git a/django/contrib/admin/templates/admin/includes/object_delete_summary.html b/django/contrib/admin/templates/admin/includes/object_delete_summary.html
index a2e78ed7a1b..6a8bf6542a5 100644
--- a/django/contrib/admin/templates/admin/includes/object_delete_summary.html
+++ b/django/contrib/admin/templates/admin/includes/object_delete_summary.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <h2>{% trans "Summary" %}</h2>
 <ul>
-    {% for model_name, object_count in model_count.items %}
+    {% for model_name, object_count in model_count %}
     <li>{{ model_name|capfirst }}: {{ object_count }}</li>
     {% endfor %}
-</ul>
\ No newline at end of file
+</ul>