mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Merged revisions 66887,66891,66902-66903,66905-66906,66911-66913,66922,66927-66928,66936,66939-66940,66962,66964,66973 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ................ r66887 | benjamin.peterson | 2008-10-13 16:51:40 -0500 (Mon, 13 Oct 2008) | 1 line document how to disable fixers ................ r66891 | amaury.forgeotdarc | 2008-10-14 16:47:22 -0500 (Tue, 14 Oct 2008) | 5 lines #4122: On Windows, Py_UNICODE_ISSPACE cannot be used in an extension module: compilation fails with "undefined reference to _Py_ascii_whitespace" Will backport to 2.6. ................ r66902 | skip.montanaro | 2008-10-15 06:49:10 -0500 (Wed, 15 Oct 2008) | 1 line easter egg ................ r66903 | benjamin.peterson | 2008-10-15 15:34:09 -0500 (Wed, 15 Oct 2008) | 1 line don't recurse into directories that start with '.' ................ r66905 | benjamin.peterson | 2008-10-15 16:05:55 -0500 (Wed, 15 Oct 2008) | 1 line support the optional line argument for idle ................ r66906 | benjamin.peterson | 2008-10-15 16:58:46 -0500 (Wed, 15 Oct 2008) | 1 line add a much requested newline ................ r66911 | benjamin.peterson | 2008-10-15 18:10:28 -0500 (Wed, 15 Oct 2008) | 41 lines Merged revisions 66805,66841,66860,66884-66886,66893,66907,66910 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r66805 | benjamin.peterson | 2008-10-04 20:11:02 -0500 (Sat, 04 Oct 2008) | 1 line mention what the fixes directory is for ........ r66841 | benjamin.peterson | 2008-10-07 17:48:12 -0500 (Tue, 07 Oct 2008) | 1 line use assertFalse and assertTrue ........ r66860 | benjamin.peterson | 2008-10-08 16:05:07 -0500 (Wed, 08 Oct 2008) | 1 line instead of abusing the pattern matcher, use start_tree to find a next binding ........ r66884 | benjamin.peterson | 2008-10-13 15:50:30 -0500 (Mon, 13 Oct 2008) | 1 line don't print tokens to stdout when -v is given ........ r66885 | benjamin.peterson | 2008-10-13 16:28:57 -0500 (Mon, 13 Oct 2008) | 1 line add the -x option to disable fixers ........ r66886 | benjamin.peterson | 2008-10-13 16:33:53 -0500 (Mon, 13 Oct 2008) | 1 line cut down on some crud ........ r66893 | benjamin.peterson | 2008-10-14 17:16:54 -0500 (Tue, 14 Oct 2008) | 1 line add an optional set literal fixer ........ r66907 | benjamin.peterson | 2008-10-15 16:59:41 -0500 (Wed, 15 Oct 2008) | 1 line don't write backup files by default ........ r66910 | benjamin.peterson | 2008-10-15 17:43:10 -0500 (Wed, 15 Oct 2008) | 1 line add the -n option; it stops backupfiles from being written ........ ................ r66912 | hirokazu.yamamoto | 2008-10-16 01:25:25 -0500 (Thu, 16 Oct 2008) | 2 lines removed unused _PyUnicode_FromFileSystemEncodedObject. made win32_chdir, win32_wchdir static. ................ r66913 | benjamin.peterson | 2008-10-16 13:52:14 -0500 (Thu, 16 Oct 2008) | 1 line document that deque indexing is O(n) #4123 ................ r66922 | benjamin.peterson | 2008-10-16 14:40:14 -0500 (Thu, 16 Oct 2008) | 1 line use new showwarnings signature for idle #3391 ................ r66927 | andrew.kuchling | 2008-10-16 15:15:47 -0500 (Thu, 16 Oct 2008) | 1 line Fix wording (2.6.1 backport candidate) ................ r66928 | georg.brandl | 2008-10-16 15:20:56 -0500 (Thu, 16 Oct 2008) | 2 lines Add more TOC to the whatsnew index page. ................ r66936 | georg.brandl | 2008-10-16 16:20:15 -0500 (Thu, 16 Oct 2008) | 2 lines #4131: FF3 doesn't write cookies.txt files. ................ r66939 | georg.brandl | 2008-10-16 16:36:39 -0500 (Thu, 16 Oct 2008) | 2 lines part of #4012: kill off old name "processing". ................ r66940 | georg.brandl | 2008-10-16 16:38:48 -0500 (Thu, 16 Oct 2008) | 2 lines #4083: add "as" to except handler grammar as per PEP 3110. ................ r66962 | benjamin.peterson | 2008-10-17 15:01:01 -0500 (Fri, 17 Oct 2008) | 1 line clarify CALL_FUNCTION #4141 ................ r66964 | georg.brandl | 2008-10-17 16:41:49 -0500 (Fri, 17 Oct 2008) | 2 lines Fix duplicate word. ................ r66973 | armin.ronacher | 2008-10-19 03:27:43 -0500 (Sun, 19 Oct 2008) | 3 lines Fixed #4067 by implementing _attributes and _fields for the AST root node. ................
This commit is contained in:
Benjamin Peterson
parent
5f3b63ad6f
commit
206e3074d3
25 changed files with 319 additions and 85 deletions
|
|
@ -1,5 +1,6 @@
|
|||
Files in this directory:
|
||||
In this directory:
|
||||
- py2_test_grammar.py -- test file that exercises most/all of Python 2.x's grammar.
|
||||
- py3_test_grammar.py -- test file that exercises most/all of Python 3.x's grammar.
|
||||
- infinite_recursion.py -- test file that causes lib2to3's faster recursive pattern matching
|
||||
scheme to fail, but passes when lib2to3 falls back to iterative pattern matching.
|
||||
- fixes/ -- for use by test_refactor.py
|
||||
|
|
|
|||
|
|
@ -3385,6 +3385,134 @@ class Test_import(FixerTestCase):
|
|||
"""
|
||||
self.check_both(b, a)
|
||||
|
||||
|
||||
class Test_set_literal(FixerTestCase):
|
||||
|
||||
fixer = "set_literal"
|
||||
|
||||
def test_basic(self):
|
||||
b = """set([1, 2, 3])"""
|
||||
a = """{1, 2, 3}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set((1, 2, 3))"""
|
||||
a = """{1, 2, 3}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set((1,))"""
|
||||
a = """{1}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([1])"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set((a, b))"""
|
||||
a = """{a, b}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([a, b])"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set((a*234, f(args=23)))"""
|
||||
a = """{a*234, f(args=23)}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([a*23, f(23)])"""
|
||||
a = """{a*23, f(23)}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([a-234**23])"""
|
||||
a = """{a-234**23}"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_listcomps(self):
|
||||
b = """set([x for x in y])"""
|
||||
a = """{x for x in y}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([x for x in y if x == m])"""
|
||||
a = """{x for x in y if x == m}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([x for x in y for a in b])"""
|
||||
a = """{x for x in y for a in b}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([f(x) - 23 for x in y])"""
|
||||
a = """{f(x) - 23 for x in y}"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_whitespace(self):
|
||||
b = """set( [1, 2])"""
|
||||
a = """{1, 2}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([1 , 2])"""
|
||||
a = """{1 , 2}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([ 1 ])"""
|
||||
a = """{ 1 }"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set( [1] )"""
|
||||
a = """{1}"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([ 1, 2 ])"""
|
||||
a = """{ 1, 2 }"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set([x for x in y ])"""
|
||||
a = """{x for x in y }"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """set(
|
||||
[1, 2]
|
||||
)
|
||||
"""
|
||||
a = """{1, 2}\n"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_comments(self):
|
||||
b = """set((1, 2)) # Hi"""
|
||||
a = """{1, 2} # Hi"""
|
||||
self.check(b, a)
|
||||
|
||||
# This isn't optimal behavior, but the fixer is optional.
|
||||
b = """
|
||||
# Foo
|
||||
set( # Bar
|
||||
(1, 2)
|
||||
)
|
||||
"""
|
||||
a = """
|
||||
# Foo
|
||||
{1, 2}
|
||||
"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_unchanged(self):
|
||||
s = """set()"""
|
||||
self.unchanged(s)
|
||||
|
||||
s = """set(a)"""
|
||||
self.unchanged(s)
|
||||
|
||||
s = """set(a, b, c)"""
|
||||
self.unchanged(s)
|
||||
|
||||
# Don't transform generators because they might have to be lazy.
|
||||
s = """set(x for x in y)"""
|
||||
self.unchanged(s)
|
||||
|
||||
s = """set(x for x in y if z)"""
|
||||
self.unchanged(s)
|
||||
|
||||
s = """set(a*823-23**2 + f(23))"""
|
||||
self.unchanged(s)
|
||||
|
||||
|
||||
class Test_sys_exc(FixerTestCase):
|
||||
fixer = "sys_exc"
|
||||
|
||||
|
|
|
|||
|
|
@ -353,29 +353,29 @@ class TestPatterns(support.TestCase):
|
|||
# Build a pattern matching a leaf
|
||||
pl = pytree.LeafPattern(100, "foo", name="pl")
|
||||
r = {}
|
||||
self.assertEqual(pl.match(root, results=r), False)
|
||||
self.assertFalse(pl.match(root, results=r))
|
||||
self.assertEqual(r, {})
|
||||
self.assertEqual(pl.match(n1, results=r), False)
|
||||
self.assertFalse(pl.match(n1, results=r))
|
||||
self.assertEqual(r, {})
|
||||
self.assertEqual(pl.match(n2, results=r), False)
|
||||
self.assertFalse(pl.match(n2, results=r))
|
||||
self.assertEqual(r, {})
|
||||
self.assertEqual(pl.match(l1, results=r), True)
|
||||
self.assertTrue(pl.match(l1, results=r))
|
||||
self.assertEqual(r, {"pl": l1})
|
||||
r = {}
|
||||
self.assertEqual(pl.match(l2, results=r), False)
|
||||
self.assertFalse(pl.match(l2, results=r))
|
||||
self.assertEqual(r, {})
|
||||
# Build a pattern matching a node
|
||||
pn = pytree.NodePattern(1000, [pl], name="pn")
|
||||
self.assertEqual(pn.match(root, results=r), False)
|
||||
self.assertFalse(pn.match(root, results=r))
|
||||
self.assertEqual(r, {})
|
||||
self.assertEqual(pn.match(n1, results=r), False)
|
||||
self.assertFalse(pn.match(n1, results=r))
|
||||
self.assertEqual(r, {})
|
||||
self.assertEqual(pn.match(n2, results=r), True)
|
||||
self.assertTrue(pn.match(n2, results=r))
|
||||
self.assertEqual(r, {"pn": n2, "pl": l3})
|
||||
r = {}
|
||||
self.assertEqual(pn.match(l1, results=r), False)
|
||||
self.assertFalse(pn.match(l1, results=r))
|
||||
self.assertEqual(r, {})
|
||||
self.assertEqual(pn.match(l2, results=r), False)
|
||||
self.assertFalse(pn.match(l2, results=r))
|
||||
self.assertEqual(r, {})
|
||||
|
||||
def testWildcardPatterns(self):
|
||||
|
|
@ -391,11 +391,11 @@ class TestPatterns(support.TestCase):
|
|||
pn = pytree.NodePattern(1000, [pl], name="pn")
|
||||
pw = pytree.WildcardPattern([[pn], [pl, pl]], name="pw")
|
||||
r = {}
|
||||
self.assertEqual(pw.match_seq([root], r), False)
|
||||
self.assertFalse(pw.match_seq([root], r))
|
||||
self.assertEqual(r, {})
|
||||
self.assertEqual(pw.match_seq([n1], r), False)
|
||||
self.assertFalse(pw.match_seq([n1], r))
|
||||
self.assertEqual(r, {})
|
||||
self.assertEqual(pw.match_seq([n2], r), True)
|
||||
self.assertTrue(pw.match_seq([n2], r))
|
||||
# These are easier to debug
|
||||
self.assertEqual(sorted(r.keys()), ["pl", "pn", "pw"])
|
||||
self.assertEqual(r["pl"], l1)
|
||||
|
|
@ -404,7 +404,7 @@ class TestPatterns(support.TestCase):
|
|||
# But this is equivalent
|
||||
self.assertEqual(r, {"pl": l1, "pn": n2, "pw": [n2]})
|
||||
r = {}
|
||||
self.assertEqual(pw.match_seq([l1, l3], r), True)
|
||||
self.assertTrue(pw.match_seq([l1, l3], r))
|
||||
self.assertEqual(r, {"pl": l3, "pw": [l1, l3]})
|
||||
self.assert_(r["pl"] is l3)
|
||||
r = {}
|
||||
|
|
|
|||
|
|
@ -123,7 +123,6 @@ class TestRefactoringTool(unittest.TestCase):
|
|||
|
||||
def test_refactor_file(self):
|
||||
test_file = os.path.join(FIXER_DIR, "parrot_example.py")
|
||||
backup = test_file + ".bak"
|
||||
old_contents = open(test_file, "r").read()
|
||||
rt = self.rt()
|
||||
|
||||
|
|
@ -133,14 +132,8 @@ class TestRefactoringTool(unittest.TestCase):
|
|||
rt.refactor_file(test_file, True)
|
||||
try:
|
||||
self.assertNotEqual(old_contents, open(test_file, "r").read())
|
||||
self.assertTrue(os.path.exists(backup))
|
||||
self.assertEqual(old_contents, open(backup, "r").read())
|
||||
finally:
|
||||
open(test_file, "w").write(old_contents)
|
||||
try:
|
||||
os.unlink(backup)
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
def test_refactor_docstring(self):
|
||||
rt = self.rt()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue