mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-29 16:46:11 +00:00
Code Issues 32 Releases Wiki Activity

remove a bunch of unnescesarry iterkeys() calls

Browse Source
This commit is contained in:
Alex Gaynor
2012-08-08 07:33:15 -07:00
parent 576ec12f8e
commit 4c97101b1f
25 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/sql/query.py
View File

@@ -1303,7 +1303,7 @@ class Query(object):
field, model, direct, m2m = opts.get_field_by_name(f.name)
break
else:
names = opts.get_all_field_names() + list(six.iterkeys(self.aggregate_select))
names = opts.get_all_field_names() + list(self.aggregate_select)
raise FieldError("Cannot resolve keyword %r into field. "
"Choices are: %s" % (name, ", ".join(names)))
@@ -1661,8 +1661,8 @@ class Query(object):
# from the model on which the lookup failed.
raise
else:
names = sorted(opts.get_all_field_names() + list(six.iterkeys(self.extra))
+ list(six.iterkeys(self.aggregate_select)))
names = sorted(opts.get_all_field_names() + list(self.extra)
+ list(self.aggregate_select))
raise FieldError("Cannot resolve keyword %r into field. "
"Choices are: %s" % (name, ", ".join(names)))
self.remove_inherited_models()