diff options
author | Rémi Cardona <remi.cardona@free.fr> | 2014-07-16 21:07:18 +0200 |
---|---|---|
committer | Rémi Cardona <remi.cardona@free.fr> | 2014-07-16 21:07:18 +0200 |
commit | 41177464eaff4aed29ac31c94b31d3720c0c1b63 (patch) | |
tree | 70cc78211259036da33c4ff15c3f172bbcd66e45 | |
parent | 6ddafad6bee3dbf207a729b75e455040d23332a9 (diff) | |
download | logilab-common-41177464eaff4aed29ac31c94b31d3720c0c1b63.tar.gz |
[py3k] Import range from six.moves
-rw-r--r-- | date.py | 4 | ||||
-rw-r--r-- | shellutils.py | 3 | ||||
-rw-r--r-- | test/unittest_shellutils.py | 8 | ||||
-rw-r--r-- | test/unittest_testlib.py | 30 | ||||
-rw-r--r-- | testlib.py | 10 |
5 files changed, 31 insertions, 24 deletions
@@ -28,6 +28,8 @@ from datetime import date, time, datetime, timedelta from time import strptime as time_strptime from calendar import monthrange, timegm +from six.moves import range + try: from mx.DateTime import RelativeDateTime, Date, DateTimeType except ImportError: @@ -131,7 +133,7 @@ def get_national_holidays(begin, end): end = datefactory(end.year, end.month, end.day, end) holidays = [str2date(datestr, begin) for datestr in FRENCH_MOBILE_HOLIDAYS.values()] - for year in xrange(begin.year, end.year+1): + for year in range(begin.year, end.year+1): for datestr in FRENCH_FIXED_HOLIDAYS.values(): date = str2date(datestr % year, begin) if date not in holidays: diff --git a/shellutils.py b/shellutils.py index 6fad79d..5adfacd 100644 --- a/shellutils.py +++ b/shellutils.py @@ -38,6 +38,7 @@ import subprocess from os.path import exists, isdir, islink, basename, join from six import string_types +from six.moves import range from logilab.common import STD_BLACKLIST, _handle_blacklist from logilab.common.compat import raw_input @@ -457,6 +458,6 @@ def getlogin(): def generate_password(length=8, vocab=string.ascii_letters + string.digits): """dumb password generation function""" pwd = '' - for i in xrange(length): + for i in range(length): pwd += random.choice(vocab) return pwd 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: @@ -60,7 +60,7 @@ from itertools import dropwhile from inspect import isgeneratorfunction from six import string_types -from six.moves import builtins +from six.moves import builtins, range from logilab.common.deprecation import deprecated @@ -841,7 +841,7 @@ class TestCase(unittest.TestCase): except SAXParseException as ex: if msg is None: stream.seek(0) - for _ in xrange(ex.getLineNumber()): + for _ in range(ex.getLineNumber()): line = stream.readline() pointer = ('' * (ex.getLineNumber() - 1)) + '^' msg = 'XML stream not well formed: %s\n%s%s' % (ex, line, pointer) @@ -900,11 +900,11 @@ class TestCase(unittest.TestCase): line_number_length = len('%i' % end) line_pattern = " %%%ii: %%s" % line_number_length - for line_no in xrange(start, ex.lineno): + for line_no in range(start, ex.lineno): context_lines.append(line_pattern % (line_no, lines[line_no-1])) context_lines.append(line_pattern % (ex.lineno, lines[ex.lineno-1])) context_lines.append('%s^\n' % (' ' * (1 + line_number_length + 2 +ex.offset))) - for line_no in xrange(ex.lineno+1, end+1): + for line_no in range(ex.lineno+1, end+1): context_lines.append(line_pattern % (line_no, lines[line_no-1])) rich_context = ''.join(context_lines) @@ -932,7 +932,7 @@ class TestCase(unittest.TestCase): self.fail( "tuple %s has %i children%s (%i expected)"%(tup, len(tup[2]), ('', 's')[len(tup[2])>1], len(element))) - for index in xrange(len(tup[2])): + for index in range(len(tup[2])): self.assertXMLEqualsTuple(element[index], tup[2][index]) #check text if element.text or len(tup)>3: |