Refs #23919 -- Removed six.PY2/PY3 usage

Thanks Tim Graham for the review.

1 files changed, 3 insertions, 21 deletions

diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index a95f8c351a..7367924600 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -179,7 +179,7 @@ class MultiValueDict(dict):
         """Appends an item to the internal list associated with key."""
         self.setlistdefault(key).append(value)
 
-    def _iteritems(self):
+    def items(self):
         """
         Yields (key, value) pairs, where value is the last item in the list
         associated with the key.
@@ -187,33 +187,15 @@ class MultiValueDict(dict):
         for key in self:
             yield key, self[key]
 
-    def _iterlists(self):
+    def lists(self):
         """Yields (key, list) pairs."""
         return six.iteritems(super(MultiValueDict, self))
 
-    def _itervalues(self):
+    def values(self):
         """Yield the last value on every key list."""
         for key in self:
             yield self[key]
 
-    if six.PY3:
-        items = _iteritems
-        lists = _iterlists
-        values = _itervalues
-    else:
-        iteritems = _iteritems
-        iterlists = _iterlists
-        itervalues = _itervalues
-
-        def items(self):
-            return list(self.iteritems())
-
-        def lists(self):
-            return list(self.iterlists())
-
-        def values(self):
-            return list(self.itervalues())
-
     def copy(self):
         """Returns a shallow copy of this object."""
         return copy.copy(self)