Skip to content
Snippets Groups Projects
Commit 4d975ac6 authored by Martin Burchell's avatar Martin Burchell
Browse files

Py3 iteritems() -> items()

parent 667da22e
No related branches found
No related tags found
2 merge requests!166Staging,!157Django 2.2 and Python 3 upgrade
import datetime
import sys
from decimal import Decimal
from django.utils import six
......@@ -102,7 +101,7 @@ class Importer(object):
if any(values):
item = self.process_row(values, columns)
item['_row_number'] = i
for taxonomy, term in meta_data.iteritems():
for taxonomy, term in meta_data.items():
self._append_term_to_item(item, taxonomy, term)
objects.append(item)
......@@ -171,7 +170,7 @@ class Importer(object):
field_to_column_map = self._get_field_to_column_map()
for field, errors in exc_inst.message.iteritems():
for field, errors in exc_inst.message.items():
for error in errors:
messages.append(
_("Column: '{0}' ({1})\nError ({2}): '{3}'\n\nValue: {4}").format(
......
......@@ -62,7 +62,7 @@ class FastDispatchMixin(object):
request = handler(path, post_params)
request.GET = request.GET.copy()
for key, value in get_params.iteritems():
for key, value in get_params.items():
if hasattr(value, '__iter__'):
request.GET.setlist(key, value)
else:
......@@ -74,7 +74,7 @@ class FastDispatchMixin(object):
request.GET.setlist(key, [value])
request.POST = request.POST.copy()
for key, value in post_params.iteritems():
for key, value in post_params.items():
if isinstance(value, File):
request.FILES.setlist(key, [value])
elif hasattr(value, '__iter__'):
......@@ -87,7 +87,7 @@ class FastDispatchMixin(object):
)
request.POST.setlist(key, [value])
for key, value in file_params.iteritems():
for key, value in file_params.items():
request.FILES.setlist(key, [value])
# Make them immutable to catch abuses that otherwise would only
......@@ -113,7 +113,7 @@ class FastDispatchMixin(object):
self.request_hook(request)
if request_extras is not None:
for key, value in request_extras.iteritems():
for key, value in request_extras.items():
setattr(request, key, value)
return request
......
......@@ -177,7 +177,7 @@ class AddEditItemView(FormView):
and len(self.item_terms[taxonomy]) > 0):
initial['category'] = self.item_terms[taxonomy][0]['name']
for taxonomy, terms in self.item_terms.iteritems():
for taxonomy, terms in self.item_terms.items():
if taxonomy in self.tag_fields:
term_names = [t['name'] for t in terms]
initial[taxonomy] = self.tag_delimiter.join(term_names)
......@@ -285,7 +285,7 @@ class AddEditItemView(FormView):
tags = {}
regular_fields = {}
for (field_name, field_value) in data.iteritems():
for (field_name, field_value) in data.items():
if field_name in self.tag_fields:
tags[field_name] = field_value
else:
......@@ -294,7 +294,7 @@ class AddEditItemView(FormView):
return category, tags, feedback_type, age_range, regular_fields
def _add_tags(self, item_id, tags):
for (taxonomy, value) in tags.iteritems():
for (taxonomy, value) in tags.items():
transport.items.delete_all_terms(item_id, taxonomy)
term_names = [t.strip() for t in value.split(self.tag_delimiter)]
......
......@@ -219,7 +219,7 @@ REST_FRAMEWORK = {
def update_recursive(dest, source):
for k, v in source.iteritems():
for k, v in source.items():
if dest.get(k, None) and isinstance(v, collections.Mapping):
update_recursive(dest[k], source[k])
else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment