From 169b1a404c8118bb75840523d5fb3543de9c8889 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 10 May 2012 20:14:04 +0200 Subject: [PATCH] Replaced foo.next() by next(foo). This new syntax for next() has been introduced in Python 2.6 and is compatible with Python 3. --- django/contrib/admin/helpers.py | 2 +- django/contrib/gis/geos/point.py | 6 +-- django/contrib/localflavor/ro/forms.py | 4 +- django/core/files/storage.py | 2 +- django/db/backends/oracle/base.py | 2 +- django/db/models/query.py | 6 +-- django/db/models/sql/compiler.py | 2 +- django/db/models/sql/query.py | 6 +-- django/http/__init__.py | 2 +- django/http/multipartparser.py | 6 +-- django/template/base.py | 2 +- django/template/defaulttags.py | 2 +- django/template/smartif.py | 6 +-- django/utils/regex_helper.py | 28 +++++------ django/utils/text.py | 2 +- docs/howto/custom-template-tags.txt | 4 +- tests/modeltests/timezones/tests.py | 48 +++++++++---------- tests/regressiontests/httpwrappers/tests.py | 2 +- tests/regressiontests/queries/tests.py | 12 ++--- .../serializers_regress/tests.py | 2 +- 20 files changed, 73 insertions(+), 73 deletions(-) diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index b08d1c84a58..58130574eef 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -53,7 +53,7 @@ class AdminForm(object): except (KeyError, IndexError): pass try: - return iter(self.form).next() + return next(iter(self.form)) except StopIteration: return None diff --git a/django/contrib/gis/geos/point.py b/django/contrib/gis/geos/point.py index 5c00a937b3c..b126856ba39 100644 --- a/django/contrib/gis/geos/point.py +++ b/django/contrib/gis/geos/point.py @@ -46,9 +46,9 @@ class Point(GEOSGeometry): cs = capi.create_cs(c_uint(1), c_uint(ndim)) i = iter(coords) - capi.cs_setx(cs, 0, i.next()) - capi.cs_sety(cs, 0, i.next()) - if ndim == 3: capi.cs_setz(cs, 0, i.next()) + capi.cs_setx(cs, 0, next(i)) + capi.cs_sety(cs, 0, next(i)) + if ndim == 3: capi.cs_setz(cs, 0, next(i)) return capi.create_point(cs) diff --git a/django/contrib/localflavor/ro/forms.py b/django/contrib/localflavor/ro/forms.py index d6aadf7ba58..5c458390b28 100644 --- a/django/contrib/localflavor/ro/forms.py +++ b/django/contrib/localflavor/ro/forms.py @@ -39,7 +39,7 @@ class ROCIFField(RegexField): key_iter = iter(key) checksum = 0 for digit in value[1:]: - checksum += int(digit) * int(key_iter.next()) + checksum += int(digit) * int(next(key_iter)) checksum = checksum * 10 % 11 if checksum == 10: checksum = 0 @@ -79,7 +79,7 @@ class ROCNPField(RegexField): checksum = 0 value_iter = iter(value) for digit in key: - checksum += int(digit) * int(value_iter.next()) + checksum += int(digit) * int(next(value_iter)) checksum %= 11 if checksum == 10: checksum = 1 diff --git a/django/core/files/storage.py b/django/core/files/storage.py index 6b724b40286..ba88674dbdf 100644 --- a/django/core/files/storage.py +++ b/django/core/files/storage.py @@ -69,7 +69,7 @@ class Storage(object): count = itertools.count(1) while self.exists(name): # file_ext includes the dot. - name = os.path.join(dir_name, "%s_%s%s" % (file_root, count.next(), file_ext)) + name = os.path.join(dir_name, "%s_%s%s" % (file_root, next(count), file_ext)) return name diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 9c91baaca72..2f3a43d698a 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -754,7 +754,7 @@ class CursorIterator(object): return self def next(self): - return _rowfactory(self.iter.next(), self.cursor) + return _rowfactory(next(self.iter), self.cursor) def _rowfactory(row, cursor): diff --git a/django/db/models/query.py b/django/db/models/query.py index e3c55766901..65a36975d5e 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -128,7 +128,7 @@ class QuerySet(object): if self._result_cache is not None: return bool(self._result_cache) try: - iter(self).next() + next(iter(self)) except StopIteration: return False return True @@ -877,7 +877,7 @@ class QuerySet(object): if self._iter: try: for i in range(num or ITER_CHUNK_SIZE): - self._result_cache.append(self._iter.next()) + self._result_cache.append(next(self._iter)) except StopIteration: self._iter = None @@ -1147,7 +1147,7 @@ class EmptyQuerySet(QuerySet): def iterator(self): # This slightly odd construction is because we need an empty generator # (it raises StopIteration immediately). - yield iter([]).next() + yield next(iter([])) def all(self): """ diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 33949f5a716..3cd26d3bc9d 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -1082,7 +1082,7 @@ def empty_iter(): """ Returns an iterator containing no results. """ - yield iter([]).next() + yield next(iter([])) def order_modified_iter(cursor, trim, sentinel): diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index c91215fa9ee..7f331bfe7f8 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -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. diff --git a/django/http/__init__.py b/django/http/__init__.py index 2815f5fbd50..2bad1460105 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -668,7 +668,7 @@ class HttpResponse(object): return self def next(self): - chunk = self._iterator.next() + chunk = next(self._iterator) if isinstance(chunk, unicode): chunk = chunk.encode(self._charset) return str(chunk) diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py index 024e11a09c3..d09c8fba869 100644 --- a/django/http/multipartparser.py +++ b/django/http/multipartparser.py @@ -291,7 +291,7 @@ class LazyStream(object): while remaining != 0: assert remaining > 0, 'remaining bytes to read should never go negative' - chunk = self.next() + chunk = next(self) emitting = chunk[:remaining] self.unget(chunk[remaining:]) @@ -313,7 +313,7 @@ class LazyStream(object): output = self._leftover self._leftover = '' else: - output = self._producer.next() + output = next(self._producer) self._unget_history = [] self.position += len(output) return output @@ -410,7 +410,7 @@ class BoundaryIter(object): before the boundary, throw away the boundary bytes themselves, and push the post-boundary bytes back on the stream. - The future calls to .next() after locating the boundary will raise a + The future calls to next() after locating the boundary will raise a StopIteration exception. """ diff --git a/django/template/base.py b/django/template/base.py index ab44bfb0b18..7cb9807bab8 100644 --- a/django/template/base.py +++ b/django/template/base.py @@ -173,7 +173,7 @@ class Token(object): sentinal = bit[2] + ')' trans_bit = [bit] while not bit.endswith(sentinal): - bit = bits.next() + bit = next(bits) trans_bit.append(bit) bit = ' '.join(trans_bit) split.append(bit) diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index c96238061c5..1e2198fc673 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -66,7 +66,7 @@ class CycleNode(Node): # First time the node is rendered in template context.render_context[self] = itertools_cycle(self.cyclevars) cycle_iter = context.render_context[self] - value = cycle_iter.next().resolve(context) + value = next(cycle_iter).resolve(context) if self.variable_name: context[self.variable_name] = value if self.silent: diff --git a/django/template/smartif.py b/django/template/smartif.py index 54d74b4e255..272eab1e918 100644 --- a/django/template/smartif.py +++ b/django/template/smartif.py @@ -165,7 +165,7 @@ class IfParser(object): self.tokens = mapped_tokens self.pos = 0 - self.current_token = self.next() + self.current_token = next(self) def translate_token(self, token): try: @@ -193,11 +193,11 @@ class IfParser(object): def expression(self, rbp=0): t = self.current_token - self.current_token = self.next() + self.current_token = next(self) left = t.nud(self) while rbp < self.current_token.lbp: t = self.current_token - self.current_token = self.next() + self.current_token = next(self) left = t.led(left, self) return left diff --git a/django/utils/regex_helper.py b/django/utils/regex_helper.py index ab101e8c32a..f17b263c379 100644 --- a/django/utils/regex_helper.py +++ b/django/utils/regex_helper.py @@ -75,7 +75,7 @@ def normalize(pattern): # at the next character and possibly go around without consuming another # one at the top of the loop. try: - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) except StopIteration: return zip([u''], [[]]) @@ -105,14 +105,14 @@ def normalize(pattern): result = result[:start] + [inner] elif ch == '[': # Replace ranges with the first character in the range. - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) result.append(ch) - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) while escaped or ch != ']': - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) elif ch == '(': # Some kind of group. - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) if ch != '?' or escaped: # A positional group name = "_%d" % num_args @@ -120,7 +120,7 @@ def normalize(pattern): result.append(Group(((u"%%(%s)s" % name), name))) walk_to_end(ch, pattern_iter) else: - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) if ch in "iLmsu#": # All of these are ignorable. Walk to the end of the # group. @@ -133,7 +133,7 @@ def normalize(pattern): # we cannot reverse. raise ValueError("Non-reversible reg-exp portion: '(?%s'" % ch) else: - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) if ch not in ('<', '='): raise ValueError("Non-reversible reg-exp portion: '(?P%s'" % ch) # We are in a named capturing group. Extra the name and @@ -144,10 +144,10 @@ def normalize(pattern): else: terminal_char = ')' name = [] - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) while ch != terminal_char: name.append(ch) - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) param = ''.join(name) # Named backreferences have already consumed the # parenthesis. @@ -183,7 +183,7 @@ def normalize(pattern): result.append(ch) if consume_next: - ch, escaped = pattern_iter.next() + ch, escaped = next(pattern_iter) else: consume_next = True except StopIteration: @@ -208,7 +208,7 @@ def next_char(input_iter): if ch != '\\': yield ch, False continue - ch = input_iter.next() + ch = next(input_iter) representative = ESCAPE_MAPPINGS.get(ch, ch) if representative is None: continue @@ -245,7 +245,7 @@ def get_quantifier(ch, input_iter): """ if ch in '*?+': try: - ch2, escaped = input_iter.next() + ch2, escaped = next(input_iter) except StopIteration: ch2 = None if ch2 == '?': @@ -256,14 +256,14 @@ def get_quantifier(ch, input_iter): quant = [] while ch != '}': - ch, escaped = input_iter.next() + ch, escaped = next(input_iter) quant.append(ch) quant = quant[:-1] values = ''.join(quant).split(',') # Consume the trailing '?', if necessary. try: - ch, escaped = input_iter.next() + ch, escaped = next(input_iter) except StopIteration: ch = None if ch == '?': diff --git a/django/utils/text.py b/django/utils/text.py index 2ac101fcb86..8ae0bf76630 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -26,7 +26,7 @@ def wrap(text, width): text = force_unicode(text) def _generator(): it = iter(text.split(' ')) - word = it.next() + word = next(it) yield word pos = len(word) - word.rfind('\n') - 1 for word in it: diff --git a/docs/howto/custom-template-tags.txt b/docs/howto/custom-template-tags.txt index ffac791ae47..1d933fe3dae 100644 --- a/docs/howto/custom-template-tags.txt +++ b/docs/howto/custom-template-tags.txt @@ -569,7 +569,7 @@ A naive implementation of ``CycleNode`` might look something like this: def __init__(self, cyclevars): self.cycle_iter = itertools.cycle(cyclevars) def render(self, context): - return self.cycle_iter.next() + return next(self.cycle_iter) But, suppose we have two templates rendering the template snippet from above at the same time: @@ -603,7 +603,7 @@ Let's refactor our ``CycleNode`` implementation to use the ``render_context``: if self not in context.render_context: context.render_context[self] = itertools.cycle(self.cyclevars) cycle_iter = context.render_context[self] - return cycle_iter.next() + return next(cycle_iter) Note that it's perfectly safe to store global information that will not change throughout the life of the ``Node`` as an attribute. In the case of diff --git a/tests/modeltests/timezones/tests.py b/tests/modeltests/timezones/tests.py index 6c2d0ea1113..bd9c7658f92 100644 --- a/tests/modeltests/timezones/tests.py +++ b/tests/modeltests/timezones/tests.py @@ -493,23 +493,23 @@ class SerializationTests(TestCase): data = serializers.serialize('python', [Event(dt=dt)]) self.assertEqual(data[0]['fields']['dt'], dt) - obj = serializers.deserialize('python', data).next().object + obj = next(serializers.deserialize('python', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('json', [Event(dt=dt)]) self.assertIn('"fields": {"dt": "2011-09-01T13:20:30"}', data) - obj = serializers.deserialize('json', data).next().object + obj = next(serializers.deserialize('json', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('xml', [Event(dt=dt)]) self.assertIn('2011-09-01T13:20:30', data) - obj = serializers.deserialize('xml', data).next().object + obj = next(serializers.deserialize('xml', data)).object self.assertEqual(obj.dt, dt) if 'yaml' in serializers.get_serializer_formats(): data = serializers.serialize('yaml', [Event(dt=dt)]) self.assertIn("- fields: {dt: !!timestamp '2011-09-01 13:20:30'}", data) - obj = serializers.deserialize('yaml', data).next().object + obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt, dt) def test_naive_datetime_with_microsecond(self): @@ -517,23 +517,23 @@ class SerializationTests(TestCase): data = serializers.serialize('python', [Event(dt=dt)]) self.assertEqual(data[0]['fields']['dt'], dt) - obj = serializers.deserialize('python', data).next().object + obj = next(serializers.deserialize('python', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('json', [Event(dt=dt)]) self.assertIn('"fields": {"dt": "2011-09-01T13:20:30.405"}', data) - obj = serializers.deserialize('json', data).next().object + obj = next(serializers.deserialize('json', data)).object self.assertEqual(obj.dt, dt.replace(microsecond=405000)) data = serializers.serialize('xml', [Event(dt=dt)]) self.assertIn('2011-09-01T13:20:30.405060', data) - obj = serializers.deserialize('xml', data).next().object + obj = next(serializers.deserialize('xml', data)).object self.assertEqual(obj.dt, dt) if 'yaml' in serializers.get_serializer_formats(): data = serializers.serialize('yaml', [Event(dt=dt)]) self.assertIn("- fields: {dt: !!timestamp '2011-09-01 13:20:30.405060'}", data) - obj = serializers.deserialize('yaml', data).next().object + obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt, dt) def test_aware_datetime_with_microsecond(self): @@ -541,23 +541,23 @@ class SerializationTests(TestCase): data = serializers.serialize('python', [Event(dt=dt)]) self.assertEqual(data[0]['fields']['dt'], dt) - obj = serializers.deserialize('python', data).next().object + obj = next(serializers.deserialize('python', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('json', [Event(dt=dt)]) self.assertIn('"fields": {"dt": "2011-09-01T17:20:30.405+07:00"}', data) - obj = serializers.deserialize('json', data).next().object + obj = next(serializers.deserialize('json', data)).object self.assertEqual(obj.dt, dt.replace(microsecond=405000)) data = serializers.serialize('xml', [Event(dt=dt)]) self.assertIn('2011-09-01T17:20:30.405060+07:00', data) - obj = serializers.deserialize('xml', data).next().object + obj = next(serializers.deserialize('xml', data)).object self.assertEqual(obj.dt, dt) if 'yaml' in serializers.get_serializer_formats(): data = serializers.serialize('yaml', [Event(dt=dt)]) self.assertIn("- fields: {dt: !!timestamp '2011-09-01 17:20:30.405060+07:00'}", data) - obj = serializers.deserialize('yaml', data).next().object + obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) def test_aware_datetime_in_utc(self): @@ -565,23 +565,23 @@ class SerializationTests(TestCase): data = serializers.serialize('python', [Event(dt=dt)]) self.assertEqual(data[0]['fields']['dt'], dt) - obj = serializers.deserialize('python', data).next().object + obj = next(serializers.deserialize('python', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('json', [Event(dt=dt)]) self.assertIn('"fields": {"dt": "2011-09-01T10:20:30Z"}', data) - obj = serializers.deserialize('json', data).next().object + obj = next(serializers.deserialize('json', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('xml', [Event(dt=dt)]) self.assertIn('2011-09-01T10:20:30+00:00', data) - obj = serializers.deserialize('xml', data).next().object + obj = next(serializers.deserialize('xml', data)).object self.assertEqual(obj.dt, dt) if 'yaml' in serializers.get_serializer_formats(): data = serializers.serialize('yaml', [Event(dt=dt)]) self.assertIn("- fields: {dt: !!timestamp '2011-09-01 10:20:30+00:00'}", data) - obj = serializers.deserialize('yaml', data).next().object + obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) def test_aware_datetime_in_local_timezone(self): @@ -589,23 +589,23 @@ class SerializationTests(TestCase): data = serializers.serialize('python', [Event(dt=dt)]) self.assertEqual(data[0]['fields']['dt'], dt) - obj = serializers.deserialize('python', data).next().object + obj = next(serializers.deserialize('python', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('json', [Event(dt=dt)]) self.assertIn('"fields": {"dt": "2011-09-01T13:20:30+03:00"}', data) - obj = serializers.deserialize('json', data).next().object + obj = next(serializers.deserialize('json', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('xml', [Event(dt=dt)]) self.assertIn('2011-09-01T13:20:30+03:00', data) - obj = serializers.deserialize('xml', data).next().object + obj = next(serializers.deserialize('xml', data)).object self.assertEqual(obj.dt, dt) if 'yaml' in serializers.get_serializer_formats(): data = serializers.serialize('yaml', [Event(dt=dt)]) self.assertIn("- fields: {dt: !!timestamp '2011-09-01 13:20:30+03:00'}", data) - obj = serializers.deserialize('yaml', data).next().object + obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) def test_aware_datetime_in_other_timezone(self): @@ -613,23 +613,23 @@ class SerializationTests(TestCase): data = serializers.serialize('python', [Event(dt=dt)]) self.assertEqual(data[0]['fields']['dt'], dt) - obj = serializers.deserialize('python', data).next().object + obj = next(serializers.deserialize('python', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('json', [Event(dt=dt)]) self.assertIn('"fields": {"dt": "2011-09-01T17:20:30+07:00"}', data) - obj = serializers.deserialize('json', data).next().object + obj = next(serializers.deserialize('json', data)).object self.assertEqual(obj.dt, dt) data = serializers.serialize('xml', [Event(dt=dt)]) self.assertIn('2011-09-01T17:20:30+07:00', data) - obj = serializers.deserialize('xml', data).next().object + obj = next(serializers.deserialize('xml', data)).object self.assertEqual(obj.dt, dt) if 'yaml' in serializers.get_serializer_formats(): data = serializers.serialize('yaml', [Event(dt=dt)]) self.assertIn("- fields: {dt: !!timestamp '2011-09-01 17:20:30+07:00'}", data) - obj = serializers.deserialize('yaml', data).next().object + obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/regressiontests/httpwrappers/tests.py index 7513c46a8fa..6dd2128afd3 100644 --- a/tests/regressiontests/httpwrappers/tests.py +++ b/tests/regressiontests/httpwrappers/tests.py @@ -281,7 +281,7 @@ class HttpResponseTests(unittest.TestCase): my_iter = r.__iter__() while True: try: - result.append(my_iter.next()) + result.append(next(my_iter)) except StopIteration: break #'\xde\x9e' == unichr(1950).encode('utf-8') diff --git a/tests/regressiontests/queries/tests.py b/tests/regressiontests/queries/tests.py index 8e86903724b..14a693f2c5f 100644 --- a/tests/regressiontests/queries/tests.py +++ b/tests/regressiontests/queries/tests.py @@ -1398,12 +1398,12 @@ class Queries6Tests(TestCase): # Test that parallel iterators work. qs = Tag.objects.all() i1, i2 = iter(qs), iter(qs) - self.assertEqual(repr(i1.next()), '') - self.assertEqual(repr(i1.next()), '') - self.assertEqual(repr(i2.next()), '') - self.assertEqual(repr(i2.next()), '') - self.assertEqual(repr(i2.next()), '') - self.assertEqual(repr(i1.next()), '') + self.assertEqual(repr(next(i1)), '') + self.assertEqual(repr(next(i1)), '') + self.assertEqual(repr(next(i2)), '') + self.assertEqual(repr(next(i2)), '') + self.assertEqual(repr(next(i2)), '') + self.assertEqual(repr(next(i1)), '') qs = X.objects.all() self.assertEqual(bool(qs), False) diff --git a/tests/regressiontests/serializers_regress/tests.py b/tests/regressiontests/serializers_regress/tests.py index 0c0c59f136c..6930fbf3938 100644 --- a/tests/regressiontests/serializers_regress/tests.py +++ b/tests/regressiontests/serializers_regress/tests.py @@ -489,7 +489,7 @@ def fieldsTest(format, self): # Serialize then deserialize the test database serialized_data = serializers.serialize(format, [obj], indent=2, fields=('field1','field3')) - result = serializers.deserialize(format, serialized_data).next() + result = next(serializers.deserialize(format, serialized_data)) # Check that the deserialized object contains data in only the serialized fields. self.assertEqual(result.object.field1, 'first')