Removed 2to3-generated list() around .items() iterator in for loops.
- Legacy-Id: 16315
This commit is contained in:
parent
2fdaa7f9c4
commit
e39ac52071
|
@ -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
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -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"))
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue