From e39ac520711711bc7ba29414cc7a3470a6132a51 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 27 Jun 2019 18:11:17 +0000 Subject: [PATCH] Removed 2to3-generated list() around .items() iterator in for loops. - Legacy-Id: 16315 --- ietf/api/management/commands/makeresources.py | 2 +- ietf/api/serializer.py | 2 +- ietf/group/migrations/0007_new_group_features_data.py | 2 +- ietf/group/migrations/0010_add_group_types.py | 4 ++-- ietf/mailtrigger/models.py | 2 +- ietf/name/migrations/0006_adjust_statenames.py | 2 +- ietf/redirects/tests.py | 2 +- ietf/utils/mail.py | 2 +- ietf/utils/tests.py | 2 +- ietf/utils/text.py | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ietf/api/management/commands/makeresources.py b/ietf/api/management/commands/makeresources.py index 03c66d64e..6cc011a74 100644 --- a/ietf/api/management/commands/makeresources.py +++ b/ietf/api/management/commands/makeresources.py @@ -66,7 +66,7 @@ class Command(AppCommand): app_resources = {} if os.path.exists(resource_file_path): resources = import_module("%s.resources" % app.name) - for n,v in list(resources.__dict__.items()): + for n,v in resources.__dict__.items(): if issubclass(type(v), type(ModelResource)): app_resources[n] = v diff --git a/ietf/api/serializer.py b/ietf/api/serializer.py index e57c73bf1..e1619351c 100644 --- a/ietf/api/serializer.py +++ b/ietf/api/serializer.py @@ -17,7 +17,7 @@ import debug # pyflakes:ignore def filter_from_queryargs(request): #@debug.trace def fix_ranges(d): - for k,v in list(d.items()): + for k,v in d.items(): if v.startswith("[") and v.endswith("]"): d[k] = [ s for s in v[1:-1].split(",") if s ] elif "," in v: diff --git a/ietf/group/migrations/0007_new_group_features_data.py b/ietf/group/migrations/0007_new_group_features_data.py index dabdb1d5f..555be5809 100644 --- a/ietf/group/migrations/0007_new_group_features_data.py +++ b/ietf/group/migrations/0007_new_group_features_data.py @@ -224,7 +224,7 @@ def forward(apps, schema_editor): for type in group_type_features: features = group_type_features[type] gf = GroupFeatures.objects.get(type=type) - for k,v in list(features.items()): + for k,v in features.items(): setattr(gf, k, v) gf.save() # This migration does not remove or change any previous fields, and executes diff --git a/ietf/group/migrations/0010_add_group_types.py b/ietf/group/migrations/0010_add_group_types.py index 98a8a6010..ad4472c67 100644 --- a/ietf/group/migrations/0010_add_group_types.py +++ b/ietf/group/migrations/0010_add_group_types.py @@ -128,13 +128,13 @@ def forward(apps, schema_editor): for slug in group_type_features: typename = group_type_features[slug]['grouptypename'] gt, _ = GroupTypeName.objects.get_or_create(slug=slug) - for k,v in list(typename.items()): + for k,v in typename.items(): setattr(gt, k, v) gt.save() # features = group_type_features[slug]['groupfeatures'] gf, _ = GroupFeatures.objects.get_or_create(type_id=slug) - for k,v in list(features.items()): + for k,v in features.items(): setattr(gf, k, v) gf.save() diff --git a/ietf/mailtrigger/models.py b/ietf/mailtrigger/models.py index 6f5abaffb..99b4b306b 100644 --- a/ietf/mailtrigger/models.py +++ b/ietf/mailtrigger/models.py @@ -18,7 +18,7 @@ def clean_duplicates(addrlist): # name from the last one: address_info[addr] = (name, a) addresses = [] - for addr, info in list(address_info.items()): + for addr, info in address_info.items(): name, a = info if (name,addr)==('',''): addresses.append(a) diff --git a/ietf/name/migrations/0006_adjust_statenames.py b/ietf/name/migrations/0006_adjust_statenames.py index 763034d76..30c49e774 100644 --- a/ietf/name/migrations/0006_adjust_statenames.py +++ b/ietf/name/migrations/0006_adjust_statenames.py @@ -79,7 +79,7 @@ def forward(apps, schema_editor): for entry in assignment_states: name, created = ReviewAssignmentStateName.objects.get_or_create(slug=entry['slug']) if created: - for k, v in list(entry.items()): + for k, v in entry.items(): setattr(name, k, v) name.save() diff --git a/ietf/redirects/tests.py b/ietf/redirects/tests.py index 257c12b59..175a1bd43 100644 --- a/ietf/redirects/tests.py +++ b/ietf/redirects/tests.py @@ -93,7 +93,7 @@ class RedirectsTests(TestCase): fixtures = ["initial_data.xml", ] def test_redirects(self): - for src, dst in list(REDIRECT_TESTS.items()): + for src, dst in REDIRECT_TESTS.items(): baseurl, args = split_url(src) response = self.client.get(baseurl, args) self.assertTrue(str(response.status_code).startswith("3")) diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py index c3e5bf939..7f22acbf3 100644 --- a/ietf/utils/mail.py +++ b/ietf/utils/mail.py @@ -284,7 +284,7 @@ def condition_message(to, frm, subject, msg, cc, extra): msg['Auto-Submitted'] = "auto-generated" msg['Precedence'] = "bulk" if extra: - for k, v in list(extra.items()): + for k, v in extra.items(): if v: assertion('len(list(set(v))) == len(v)') try: diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py index f28fb55da..855139547 100644 --- a/ietf/utils/tests.py +++ b/ietf/utils/tests.py @@ -205,7 +205,7 @@ class TemplateChecksTestCase(TestCase): def apply_template_test(self, func, node_type, msg, *args, **kwargs): errors = [] - for path, template in list(self.templates.items()): + for path, template in self.templates.items(): origin = str(template.origin).replace(settings.BASE_DIR, '') for node in template: for child in node.get_nodes_by_type(node_type): diff --git a/ietf/utils/text.py b/ietf/utils/text.py index 06a4d05e9..131f13fa7 100644 --- a/ietf/utils/text.py +++ b/ietf/utils/text.py @@ -174,7 +174,7 @@ def text_to_dict(t): def dict_to_text(d): "Convert a dictionary to RFC2822-formatted text" t = "" - for k, v in list(d.items()): + for k, v in d.items(): t += "%s: %s\n" % (k, v) return t