diff options
author | Rémi Cardona <remi.cardona@free.fr> | 2014-07-16 20:35:16 +0200 |
---|---|---|
committer | Rémi Cardona <remi.cardona@free.fr> | 2014-07-16 20:35:16 +0200 |
commit | e9945844342c166d5f095b4c261c5b70829dcc7a (patch) | |
tree | 12a3d593b2f75fe5381f1a230519aa494e6afe8c | |
parent | 90e206fe98d7c057316b272f651373376a2d3539 (diff) | |
download | logilab-common-e9945844342c166d5f095b4c261c5b70829dcc7a.tar.gz |
Use next(iterator) instead of py3k incompatible iterator.next() (related to #264017)
Requires python >= 2.6.
-rw-r--r-- | test/unittest_table.py | 4 | ||||
-rw-r--r-- | test/unittest_tree.py | 8 | ||||
-rw-r--r-- | testlib.py | 4 | ||||
-rw-r--r-- | visitor.py | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/test/unittest_table.py b/test/unittest_table.py index 7c58d69..2ce566a 100644 --- a/test/unittest_table.py +++ b/test/unittest_table.py @@ -70,8 +70,8 @@ class TableTC(TestCase): def test_iterable(self): """test iter(table)""" it = iter(self.table) - self.assertTrue(it.next() == self.table.data[0]) - self.assertTrue(it.next() == self.table.data[1]) + self.assertTrue(next(it) == self.table.data[0]) + self.assertTrue(next(it) == self.table.data[1]) def test_get_rows(self): """tests Table.get_rows()""" diff --git a/test/unittest_tree.py b/test/unittest_tree.py index fb8e303..ea5af81 100644 --- a/test/unittest_tree.py +++ b/test/unittest_tree.py @@ -189,11 +189,11 @@ class PostfixedDepthFirstIterator_ClassTest(TestCase): def test_known_values_next(self): L = ['child_2_1', 'child_3_1', 'child_2_2', 'child_1_1', 'child_2_3', 'child_1_2', 'root'] iter = PostfixedDepthFirstIterator(self.o) - o = iter.next() + o = next(iter) i = 0 while o: self.assertEqual(o.id, L[i]) - o = iter.next() + o = next(iter) i += 1 @@ -235,11 +235,11 @@ class PrefixedDepthFirstIterator_ClassTest(TestCase): def test_known_values_next(self): L = ['root', 'child_1_1', 'child_2_1', 'child_2_2', 'child_3_1', 'child_1_2', 'child_2_3'] iter = PrefixedDepthFirstIterator(self.o) - o = iter.next() + o = next(iter) i = 0 while o: self.assertEqual(o.id, L[i]) - o = iter.next() + o = next(iter) i += 1 @@ -1025,9 +1025,9 @@ succeeded test into", osp.join(os.getcwd(), FILE_RESTART) ipath_a, idirs_a, ifiles_a = data_a = None, None, None while True: try: - ipath_a, idirs_a, ifiles_a = datas_a = iter_a.next() + ipath_a, idirs_a, ifiles_a = datas_a = next(iter_a) partial_iter = False - ipath_b, idirs_b, ifiles_b = datas_b = iter_b.next() + ipath_b, idirs_b, ifiles_b = datas_b = next(iter_b) partial_iter = True @@ -61,10 +61,10 @@ class Visitor(object): def _visit(self, node): iterator = self._get_iterator(node) - n = iterator.next() + n = next(iterator) while n: result = n.accept(self) - n = iterator.next() + n = next(iterator) return result def _get_iterator(self, node): |