From 38a5a1d5bd5bcccf52a66a84377429bdecdfa4a2 Mon Sep 17 00:00:00 2001 From: Kui Shi Date: Tue, 15 Oct 2013 16:34:58 +0800 Subject: [PATCH] Replace g.next() with next(g) 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 --- troveclient/tests/test_common.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/troveclient/tests/test_common.py b/troveclient/tests/test_common.py index c0d8090f..cf921f15 100644 --- a/troveclient/tests/test_common.py +++ b/troveclient/tests/test_common.py @@ -51,10 +51,10 @@ class PaginatedTest(TestCase): def test___iter__(self): itr_expected = self.items_.__iter__() itr = self.pgn.__iter__() - self.assertEqual(itr_expected.next(), itr.next()) - self.assertEqual(itr_expected.next(), itr.next()) - self.assertRaises(StopIteration, itr_expected.next) - self.assertRaises(StopIteration, itr.next) + self.assertEqual(next(itr_expected), next(itr)) + self.assertEqual(next(itr_expected), next(itr)) + self.assertRaises(StopIteration, next, itr_expected) + self.assertRaises(StopIteration, next, itr) def test___getitem__(self): self.assertEqual(self.items_[0], self.pgn.__getitem__(0)) @@ -70,9 +70,9 @@ class PaginatedTest(TestCase): def test___reversed__(self): itr = self.pgn.__reversed__() expected = ["item2", "item1"] - self.assertEqual("item2", itr.next()) - self.assertEqual("item1", itr.next()) - self.assertRaises(StopIteration, itr.next) + self.assertEqual("item2", next(itr)) + self.assertEqual("item1", next(itr)) + self.assertRaises(StopIteration, next, itr) def test___contains__(self): self.assertTrue(self.pgn.__contains__("item1"))