[py3k] Import range from six.moves

2 files changed, 21 insertions, 17 deletions

diff --git a/test/unittest_shellutils.py b/test/unittest_shellutils.py
index d883c08..ca23f1b 100644
--- a/test/unittest_shellutils.py
+++ b/test/unittest_shellutils.py
@@ -22,6 +22,8 @@ from os.path import join, dirname, abspath
 import datetime, time
 from StringIO import StringIO
 
+from six.moves import range
+
 from logilab.common.testlib import TestCase, unittest_main
 
 from logilab.common.shellutils import (globfind, find, ProgressBar,
@@ -121,7 +123,7 @@ class ProgressBarTC(TestCase):
             self.assertEqual(pgb_stream.getvalue(), expected_stream.getvalue())
 
     def test_default(self):
-        self._update_test(20, xrange(1, 21))
+        self._update_test(20, range(1, 21))
 
     def test_nbops_gt_size(self):
         """Test the progress bar for nbops > size"""
@@ -150,7 +152,7 @@ class ProgressBarTC(TestCase):
         size=20
         pgb = ProgressBar(100, size, stream=pgb_stream)
         last = 0
-        for dots in xrange(10, 105, 15):
+        for dots in range(10, 105, 15):
             pgb.update(dots, exact=True)
             dots //= 5
             expected_stream.write("\r["+('='*dots)+(' '*(size-dots))+"]")
@@ -162,7 +164,7 @@ class ProgressBarTC(TestCase):
         size=20
         pgb = ProgressBar(100, size, stream=pgb_stream)
         last = 0
-        for dots in xrange(5, 105, 5):
+        for dots in range(5, 105, 5):
             pgb.update(5, exact=False)
             dots //= 5
             expected_stream.write("\r["+('='*dots)+(' '*(size-dots))+"]")
diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py
index 59e736d..e07ab21 100644
--- a/test/unittest_testlib.py
+++ b/test/unittest_testlib.py
@@ -31,6 +31,8 @@ try:
 except NameError:
     __file__ = sys.argv[0]
 
+from six.moves import range
+
 from logilab.common.testlib import (unittest, TestSuite, unittest_main, Tags,
     TestCase, mock_object, create_files, InnerTest, with_tempdir, tag,
     require_version, require_module)
@@ -103,9 +105,9 @@ class TestlibTC(TestCase):
 
     def test_list_equals(self):
         """tests TestCase.assertListEqual"""
-        l1 = range(10)
-        l2 = range(5)
-        l3 = range(10)
+        l1 = list(range(10))
+        l2 = list(range(5))
+        l3 = list(range(10))
         self.assertRaises(AssertionError, self.tc.assertListEqual, l1, l2)
         self.tc.assertListEqual(l1, l1)
         self.tc.assertListEqual(l1, l3)
@@ -261,7 +263,7 @@ class GenerativeTestsTC(TestCase):
     def test_generative_ok(self):
         class FooTC(TestCase):
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     yield self.assertEqual, i, i
         result = self.runner.run(FooTC('test_generative'))
         self.assertEqual(result.testsRun, 10)
@@ -271,7 +273,7 @@ class GenerativeTestsTC(TestCase):
     def test_generative_half_bad(self):
         class FooTC(TestCase):
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     yield self.assertEqual, i%2, 0
         result = self.runner.run(FooTC('test_generative'))
         self.assertEqual(result.testsRun, 10)
@@ -281,7 +283,7 @@ class GenerativeTestsTC(TestCase):
     def test_generative_error(self):
         class FooTC(TestCase):
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     if i == 5:
                         raise ValueError('STOP !')
                     yield self.assertEqual, i, i
@@ -294,7 +296,7 @@ class GenerativeTestsTC(TestCase):
     def test_generative_error2(self):
         class FooTC(TestCase):
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     if i == 5:
                         yield self.ouch
                     yield self.assertEqual, i, i
@@ -309,7 +311,7 @@ class GenerativeTestsTC(TestCase):
             def setUp(self):
                 raise ValueError('STOP !')
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     yield self.assertEqual, i, i
 
         result = self.runner.run(FooTC('test_generative'))
@@ -326,7 +328,7 @@ class GenerativeTestsTC(TestCase):
                     self.assertEqual(val, val)
 
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     yield InnerTest("check_%s"%i, self.check, i)
 
         result = self.runner.run(FooTC('test_generative'))
@@ -344,7 +346,7 @@ class GenerativeTestsTC(TestCase):
                     self.assertEqual(val, val)
 
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     yield InnerTest("check_%s"%i, self.check, i)
 
         result = self.runner.run(FooTC('test_generative'))
@@ -362,7 +364,7 @@ class GenerativeTestsTC(TestCase):
                     self.assertEqual(val, val)
 
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     yield InnerTest("check_%s"%i, self.check, i)
 
         result = self.runner.run(FooTC('test_generative'))
@@ -380,7 +382,7 @@ class GenerativeTestsTC(TestCase):
                     self.assertEqual(val, val)
 
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     yield InnerTest("check_%s"%i, self.check, i)
 
         result = self.runner.run(FooTC('test_generative'))
@@ -420,7 +422,7 @@ class ExitFirstTC(TestCase):
     def test_generative_exit_first(self):
         class FooTC(TestCase):
             def test_generative(self):
-                for i in xrange(10):
+                for i in range(10):
                     yield self.assert_, False
         result = self.runner.run(FooTC('test_generative'))
         self.assertEqual(result.testsRun, 1)
@@ -533,7 +535,7 @@ class TestLoaderTC(TestCase):
             class MyTestCase(TestCase):
                 def test_foo(self): pass
                 def test_foobar(self):
-                    for i in xrange(5):
+                    for i in range(5):
                         if i%2 == 0:
                             yield InnerTest('even', lambda: None)
                         else: