Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-02 12:34:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use django.utils.six.iteritems in wagtail.utils.utils.deep_update.

Browse source
This commit is contained in:
Mads Jensen 2017-10-05 13:25:38 +02:00 committed by Matt Westcott
parent de3f9550b4
commit 11bf9b0e28
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wagtail/utils/utils.py
View file

@ -1,7 +1,8 @@
from __future__ import absolute_import, unicode_literals
import collections
import sys
from django.utils import six
def deep_update(source, overrides):
@ -9,10 +10,7 @@ def deep_update(source, overrides):
Modify ``source`` in place.
"""
if sys.version_info >= (3, 0):
items = overrides.items()
else:
items = overrides.iteritems()
items = six.iteritems(overrides)
for key, value in items:
if isinstance(value, collections.Mapping) and value: