Skip to content

Commit e39ac52

Browse files
committed
Removed 2to3-generated list() around .items() iterator in for loops.
- Legacy-Id: 16315
1 parent 2fdaa7f commit e39ac52

10 files changed

Lines changed: 11 additions & 11 deletions

File tree

ietf/api/management/commands/makeresources.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def handle_app_config(self, app, **options):
6666
app_resources = {}
6767
if os.path.exists(resource_file_path):
6868
resources = import_module("%s.resources" % app.name)
69-
for n,v in list(resources.__dict__.items()):
69+
for n,v in resources.__dict__.items():
7070
if issubclass(type(v), type(ModelResource)):
7171
app_resources[n] = v
7272

ietf/api/serializer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
def filter_from_queryargs(request):
1818
#@debug.trace
1919
def fix_ranges(d):
20-
for k,v in list(d.items()):
20+
for k,v in d.items():
2121
if v.startswith("[") and v.endswith("]"):
2222
d[k] = [ s for s in v[1:-1].split(",") if s ]
2323
elif "," in v:

ietf/group/migrations/0007_new_group_features_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def forward(apps, schema_editor):
224224
for type in group_type_features:
225225
features = group_type_features[type]
226226
gf = GroupFeatures.objects.get(type=type)
227-
for k,v in list(features.items()):
227+
for k,v in features.items():
228228
setattr(gf, k, v)
229229
gf.save()
230230
# This migration does not remove or change any previous fields, and executes

ietf/group/migrations/0010_add_group_types.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@ def forward(apps, schema_editor):
128128
for slug in group_type_features:
129129
typename = group_type_features[slug]['grouptypename']
130130
gt, _ = GroupTypeName.objects.get_or_create(slug=slug)
131-
for k,v in list(typename.items()):
131+
for k,v in typename.items():
132132
setattr(gt, k, v)
133133
gt.save()
134134
#
135135
features = group_type_features[slug]['groupfeatures']
136136
gf, _ = GroupFeatures.objects.get_or_create(type_id=slug)
137-
for k,v in list(features.items()):
137+
for k,v in features.items():
138138
setattr(gf, k, v)
139139
gf.save()
140140

ietf/mailtrigger/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def clean_duplicates(addrlist):
1818
# name from the last one:
1919
address_info[addr] = (name, a)
2020
addresses = []
21-
for addr, info in list(address_info.items()):
21+
for addr, info in address_info.items():
2222
name, a = info
2323
if (name,addr)==('',''):
2424
addresses.append(a)

ietf/name/migrations/0006_adjust_statenames.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def forward(apps, schema_editor):
7979
for entry in assignment_states:
8080
name, created = ReviewAssignmentStateName.objects.get_or_create(slug=entry['slug'])
8181
if created:
82-
for k, v in list(entry.items()):
82+
for k, v in entry.items():
8383
setattr(name, k, v)
8484
name.save()
8585

ietf/redirects/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class RedirectsTests(TestCase):
9393
fixtures = ["initial_data.xml", ]
9494

9595
def test_redirects(self):
96-
for src, dst in list(REDIRECT_TESTS.items()):
96+
for src, dst in REDIRECT_TESTS.items():
9797
baseurl, args = split_url(src)
9898
response = self.client.get(baseurl, args)
9999
self.assertTrue(str(response.status_code).startswith("3"))

ietf/utils/mail.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ def condition_message(to, frm, subject, msg, cc, extra):
284284
msg['Auto-Submitted'] = "auto-generated"
285285
msg['Precedence'] = "bulk"
286286
if extra:
287-
for k, v in list(extra.items()):
287+
for k, v in extra.items():
288288
if v:
289289
assertion('len(list(set(v))) == len(v)')
290290
try:

ietf/utils/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def test_parse_templates(self):
205205

206206
def apply_template_test(self, func, node_type, msg, *args, **kwargs):
207207
errors = []
208-
for path, template in list(self.templates.items()):
208+
for path, template in self.templates.items():
209209
origin = str(template.origin).replace(settings.BASE_DIR, '')
210210
for node in template:
211211
for child in node.get_nodes_by_type(node_type):

ietf/utils/text.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def text_to_dict(t):
174174
def dict_to_text(d):
175175
"Convert a dictionary to RFC2822-formatted text"
176176
t = ""
177-
for k, v in list(d.items()):
177+
for k, v in d.items():
178178
t += "%s: %s\n" % (k, v)
179179
return t
180180

0 commit comments

Comments
 (0)