8000 Use the builtin next() function instead of generator.next() · wulczer/txpostgres@30a0903 · GitHub
[go: up one dir, main page]

Skip to content

Commit 30a0903

Browse files
committed
Use the builtin next() function instead of generator.next()
This makes the code compatible with Python 3, but not with Python 2.5, which is fine since Twisted itself is no longer compatible with Python 2.5.
1 parent aac7224 commit 30a0903

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

test/test_retrying.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ def test_simple(self):
1818
it = retrying.simpleBackoffIterator()
1919

2020
# by default "now" is set
21-
self.assertEquals(it.next(), 0)
21+
self.assertEquals(next(it), 0)
2222

23-
r1, r2, r3 = it.next(), it.next(), it.next()
23+
r1, r2, r3 = next(it), next(it), next(it)
2424
self.assertTrue(r1 < r2 < r3)
2525

2626
def test_maxDelay(self):
@@ -29,32 +29,32 @@ def test_maxDelay(self):
2929
"""
3030
it = retrying.simpleBackoffIterator(maxDelay=2.0)
3131

32-
res = [it.next() for _ in range(5)]
32+
res = [next(it) for _ in range(5)]
3333
self.assertEquals(res[-1], 2.0)
3434

3535
def test_notNow(self):
3636
"""
3737
If now is not set, the first delay is not zero.
3838
"""
3939
it = retrying.simpleBackoffIterator(now=False)
40-
self.assertNotEquals(it.next(), 0)
40+
self.assertNotEquals(next(it), 0)
4141

4242
def test_maxRetries(self):
4343
"""
4444
The iterator gets exhausted if retries are capped.
4545
"""
4646
it = retrying.simpleBackoffIterator(maxRetries=3)
4747

48-
it.next(), it.next(), it.next()
49-
self.assertRaises(StopIteration, it.next)
48+
next(it), next(it), next(it)
49+
self.assertRaises(StopIteration, lambda: next(it))
5050

5151
def test_noMaxRetries(self):
5252
"""
5353
The iterator does not get exhausted if retries are not capped.
5454
"""
5555
it = retrying.simpleBackoffIterator(maxRetries=0, maxDelay=1)
5656

57-
alot = [it.next() for _ in range(1000)]
57+
alot = [next(it) for _ in range(1000)]
5858
self.assertEquals(alot[-1], 1)
5959

6060
def test_noMaxDelay(self):
@@ -64,7 +64,7 @@ def test_noMaxDelay(self):
6464
it = retrying.simpleBackoffIterator(maxRetries=0, maxDelay=0)
6565

6666
# putting range(1000) here makes Python return a NaN, so be moderate
67-
alot = [it.next() for _ in range(100)]
67+
alot = [next(it) for _ in range(100)]
6868
self.assertTrue(alot[-2] < alot[-1])
6969

7070
def test_precise(self):
@@ -75,12 +75,12 @@ def test_precise(self):
7575
it = retrying.simpleBackoffIterator(initialDelay=10, maxDelay=90,
7676
factor=2, jitter=0)
7777

78-
self.assertEquals(it.next(), 0)
79-
self.assertEquals(it.next(), 20)
80-
self.assertEquals(it.next(), 40)
81-
self.assertEquals(it.next(), 80)
82-
self.assertEquals(it.next(), 90)
83-
self.assertEquals(it.next(), 90)
78+
self.assertEquals( B4E9 next(it), 0)
79+
self.assertEquals(next(it), 20)
80+
self.assertEquals(next(it), 40)
81+
self.assertEquals(next(it), 80)
82+
self.assertEquals(next(it), 90)
83+
self.assertEquals(next(it), 90)
8484

8585

8686
class TestRetryingCall(unittest.TestCase):

txpostgres/retrying.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def _err(self, fail):
111111

112112
def _call(self):
113113
try:
114-
delay = self._backoffIterator.next()
114+
delay = next(self._backoffIterator)
115115
except StopIteration:
116116
self._deferred.errback(self.failure)
117117
else:

0 commit comments

Comments
 (0)
0