Eliminate references to django.utils.six.iteritems

wagtail/utils/utils.py

@@ -2,17 +2,13 @@ from __future__ import absolute_import, unicode_literals
 
 import collections
 
-from django.utils import six
-
 
 def deep_update(source, overrides):
     """Update a nested dictionary or similar mapping.
 
     Modify ``source`` in place.
     """
-    items = six.iteritems(overrides)
-
-    for key, value in items:
+    for key, value in overrides.items():
         if isinstance(value, collections.Mapping) and value:
             returned = deep_update(source.get(key, {}), value)
             source[key] = returned

wagtail/wagtailcore/tests/test_migrations.py

@@ -11,7 +11,6 @@ from django.db.migrations.loader import MigrationLoader
 from django.db.migrations.questioner import MigrationQuestioner
 from django.db.migrations.state import ProjectState
 from django.test import TestCase
-from django.utils.six import iteritems
 
 
 class TestForMigrations(TestCase):
@@ -24,7 +23,7 @@ class TestForMigrations(TestCase):
 
         conflicts = dict(
             (app_label, conflict)
-            for app_label, conflict in iteritems(loader.detect_conflicts())
+            for app_label, conflict in loader.detect_conflicts().items()
             if app_label in app_labels
         )
 

wagtail/wagtailsites/tests.py

@@ -4,7 +4,6 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
 from django.test import TestCase
 from django.urls import reverse
-from django.utils import six
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailcore.models import Page, Site
@@ -139,7 +138,7 @@ class TestSiteEditView(TestCase, WagtailTestUtils):
             'port': site.port,
             'root_page': site.root_page.id,
         }
-        for k, v in six.iteritems(post_defaults):
+        for k, v in post_defaults.items():
             post_data[k] = post_data.get(k, v)
         if 'default' in post_data:
             if post_data['default']:  # only include the is_default_site key if we want to set it

wagtail/wagtailusers/tests.py

@@ -8,7 +8,6 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from django.http import HttpRequest, HttpResponse
 from django.test import TestCase, override_settings
 from django.urls import reverse
-from django.utils import six
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailcore import hooks
@@ -975,7 +974,7 @@ class TestGroupCreateView(TestCase, WagtailTestUtils):
             'image_permissions-MAX_NUM_FORMS': ['1000'],
             'image_permissions-INITIAL_FORMS': ['0'],
         }
-        for k, v in six.iteritems(post_defaults):
+        for k, v in post_defaults.items():
             post_data[k] = post_data.get(k, v)
         return self.client.post(reverse('wagtailusers_groups:add'), post_data)
 
@@ -1132,7 +1131,7 @@ class TestGroupEditView(TestCase, WagtailTestUtils):
             'image_permissions-MAX_NUM_FORMS': ['1000'],
             'image_permissions-INITIAL_FORMS': ['0'],
         }
-        for k, v in six.iteritems(post_defaults):
+        for k, v in post_defaults.items():
             post_data[k] = post_data.get(k, v)
         return self.client.post(reverse(
             'wagtailusers_groups:edit', args=(group_id or self.test_group.pk, )), post_data)