openstack/python-troveclient
Code Issues Proposed changes

Replace g.next() with next(g)

Browse Source 
In Python 3, g.next() has been renamed to g.__next__().
The next() buildin function will work fine for Python 2&3.

Partial implements: blueprint py33-support
Change-Id: I992d019eb180f514388f21b2400b51c94c7bdad5
This commit is contained in:
Kui Shi
2013-10-15 16:34:58 +08:00
parent 24a650dfaa
commit 38a5a1d5bd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
troveclient/tests/test_common.py
View File

@@ -51,10 +51,10 @@ class PaginatedTest(TestCase):
def test___iter__(self): def test___iter__(self):
itr_expected = self.items_.__iter__() itr_expected = self.items_.__iter__()
itr = self.pgn.__iter__() itr = self.pgn.__iter__()
self.assertEqual(itr_expected.next(), itr.next()) self.assertEqual(next(itr_expected), next(itr))
self.assertEqual(itr_expected.next(), itr.next()) self.assertEqual(next(itr_expected), next(itr))
self.assertRaises(StopIteration, itr_expected.next) self.assertRaises(StopIteration, next, itr_expected)
self.assertRaises(StopIteration, itr.next) self.assertRaises(StopIteration, next, itr)
def test___getitem__(self): def test___getitem__(self):
self.assertEqual(self.items_[0], self.pgn.__getitem__(0)) self.assertEqual(self.items_[0], self.pgn.__getitem__(0))
@@ -70,9 +70,9 @@ class PaginatedTest(TestCase):
def test___reversed__(self): def test___reversed__(self):
itr = self.pgn.__reversed__() itr = self.pgn.__reversed__()
expected = ["item2", "item1"] expected = ["item2", "item1"]
self.assertEqual("item2", itr.next()) self.assertEqual("item2", next(itr))
self.assertEqual("item1", itr.next()) self.assertEqual("item1", next(itr))
self.assertRaises(StopIteration, itr.next) self.assertRaises(StopIteration, next, itr)
def test___contains__(self): def test___contains__(self):
self.assertTrue(self.pgn.__contains__("item1")) self.assertTrue(self.pgn.__contains__("item1"))