diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2008-04-10 02:48:01 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2008-04-10 02:48:01 (GMT) |
commit | 60a819d681d1004a9703b050501b70912f40b1ed (patch) | |
tree | c7f8b66797ba0df84f074c71e437d574137dc775 /Lib/lib2to3/tests | |
parent | c00eb73a309d5e9a4e89c3114b32eda88bd83e98 (diff) | |
download | cpython-60a819d681d1004a9703b050501b70912f40b1ed.zip cpython-60a819d681d1004a9703b050501b70912f40b1ed.tar.gz cpython-60a819d681d1004a9703b050501b70912f40b1ed.tar.bz2 |
Merged revisions 62080-62262 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r62092 | collin.winter | 2008-04-01 18:27:10 +0200 (Di, 01 Apr 2008) | 1 line
Add get_prev_sibling() to complement pytree's get_next_sibling().
........
r62226 | collin.winter | 2008-04-08 21:07:56 +0200 (Di, 08 Apr 2008) | 1 line
Add min() and max() to the list of special contexts that don't require adding list() calls around dict methods.
........
r62232 | collin.winter | 2008-04-09 00:12:38 +0200 (Mi, 09 Apr 2008) | 4 lines
Fix for http://bugs.python.org/issue2596
This extends fix_xrange to know about the (mostly) same special contexts as fix_dict (where a special context is something that is guaranteed to fully consume the iterable), adding list() calls where appropriate. It also special-cases "x in range(y)".
........
Diffstat (limited to 'Lib/lib2to3/tests')
-rwxr-xr-x | Lib/lib2to3/tests/test_fixers.py | 41 | ||||
-rwxr-xr-x | Lib/lib2to3/tests/test_pytree.py | 18 |
2 files changed, 53 insertions, 6 deletions
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py index 150b1a7..20d6008 100755 --- a/Lib/lib2to3/tests/test_fixers.py +++ b/Lib/lib2to3/tests/test_fixers.py @@ -16,6 +16,8 @@ from os.path import dirname, pathsep from .. import pygram from .. import pytree from .. import refactor +from ..fixes import util + class Options: def __init__(self, **kwargs): @@ -1105,8 +1107,7 @@ class Test_dict(FixerTestCase): self.check(b, a) def test_unchanged(self): - wrappers = ["set", "sorted", "any", "all", "tuple", "sum"] - for wrapper in wrappers: + for wrapper in util.consuming_calls: s = "s = %s(d.keys())" % wrapper self.unchanged(s) @@ -1254,26 +1255,54 @@ class Test_xrange(FixerTestCase): a = """x = range( 0 , 10 , 2 )""" self.check(b, a) - def test_1(self): + def test_single_arg(self): b = """x = xrange(10)""" a = """x = range(10)""" self.check(b, a) - def test_2(self): + def test_two_args(self): b = """x = xrange(1, 10)""" a = """x = range(1, 10)""" self.check(b, a) - def test_3(self): + def test_three_args(self): b = """x = xrange(0, 10, 2)""" a = """x = range(0, 10, 2)""" self.check(b, a) - def test_4(self): + def test_wrap_in_list(self): + b = """x = range(10, 3, 9)""" + a = """x = list(range(10, 3, 9))""" + self.check(b, a) + + b = """x = foo(range(10, 3, 9))""" + a = """x = foo(list(range(10, 3, 9)))""" + self.check(b, a) + + b = """x = range(10, 3, 9) + [4]""" + a = """x = list(range(10, 3, 9)) + [4]""" + self.check(b, a) + + def test_xrange_in_for(self): b = """for i in xrange(10):\n j=i""" a = """for i in range(10):\n j=i""" self.check(b, a) + b = """[i for i in xrange(10)]""" + a = """[i for i in range(10)]""" + self.check(b, a) + + def test_range_in_for(self): + self.unchanged("for i in range(10): pass") + self.unchanged("[i for i in range(10)]") + + def test_in_contains_test(self): + self.unchanged("x in range(10, 3, 9)") + + def test_in_consuming_context(self): + for call in util.consuming_calls: + self.unchanged("a = %s(range(10))" % call) + class Test_raw_input(FixerTestCase): fixer = "raw_input" diff --git a/Lib/lib2to3/tests/test_pytree.py b/Lib/lib2to3/tests/test_pytree.py index 8876beb..57c8a82 100755 --- a/Lib/lib2to3/tests/test_pytree.py +++ b/Lib/lib2to3/tests/test_pytree.py @@ -319,6 +319,24 @@ class TestNodes(support.TestCase): self.assertEqual(l2.get_next_sibling(), None) self.assertEqual(p1.get_next_sibling(), None) + def testNodePrevSibling(self): + n1 = pytree.Node(1000, []) + n2 = pytree.Node(1000, []) + p1 = pytree.Node(1000, [n1, n2]) + + self.failUnless(n2.get_prev_sibling() is n1) + self.assertEqual(n1.get_prev_sibling(), None) + self.assertEqual(p1.get_prev_sibling(), None) + + def testLeafPrevSibling(self): + l1 = pytree.Leaf(100, "a") + l2 = pytree.Leaf(100, "b") + p1 = pytree.Node(1000, [l1, l2]) + + self.failUnless(l2.get_prev_sibling() is l1) + self.assertEqual(l1.get_prev_sibling(), None) + self.assertEqual(p1.get_prev_sibling(), None) + class TestPatterns(support.TestCase): |