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

Replaced foo.next() by next(foo).

Browse Source 
This new syntax for next() has been introduced in Python 2.6 and is
compatible with Python 3.
This commit is contained in:
Claude Paroz
2012-05-10 20:14:04 +02:00
parent 1c1a229632
commit 169b1a404c
20 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1140,10 +1140,10 @@ class Query(object):
# join list) an outer join.
join_it = iter(join_list)
table_it = iter(self.tables)
join_it.next(), table_it.next()
next(join_it), next(table_it)
unconditional = False
for join in join_it:
table = table_it.next()
table = next(table_it)
# Once we hit an outer join, all subsequent joins must
# also be promoted, regardless of whether they have been
# promoted as a result of this pass through the tables.
@@ -1774,7 +1774,7 @@ class Query(object):
entry_params = []
pos = entry.find("%s")
while pos != -1:
entry_params.append(param_iter.next())
entry_params.append(next(param_iter))
pos = entry.find("%s", pos + 2)
select_pairs[name] = (entry, entry_params)
# This is order preserving, since self.extra_select is a SortedDict.