python3: replace dict.iteritems() by items() (#40012)

This commit is contained in:
Nicolas Roche 2020-02-20 13:39:22 +01:00
parent 068ad2dd72
commit 53b81ec6ab
2 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@ from django.utils import six
def byteify(input):
if isinstance(input, dict):
return {byteify(key): byteify(value)
for key, value in input.iteritems()}
for key, value in input.items()}
elif isinstance(input, list):
return [byteify(element) for element in input]
elif isinstance(input, six.text_type):

View File

@ -8,12 +8,12 @@ class PatchDefaultSettings(object):
self.old = {}
def __enter__(self):
for key, value in self.patch.iteritems():
for key, value in self.patch.items():
self.old[key] = getattr(self.settings.default_settings, key, self.empty)
setattr(self.settings.default_settings, key, value)
def __exit__(self, *args, **kwargs):
for key, value in self.old.iteritems():
for key, value in self.old.items():
if value is self.empty:
delattr(self.settings.default_settings, key)
else: