Mercurial > cpython-lru_cache-weakref

annotate Lib/lib2to3/tests/test_parser.py @ 78069:a8aa77458e12 3.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add c_size_t and c_ssize_t to the ctypes summary table.
author Antoine Pitrou <solipsis@pitrou.net>
date Thu, 12 Jul 2012 20:31:50 +0200
parents 2fd68efac05a
children e721b2b74b59
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
1 """Test suite for 2to3's parser and grammar files.
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
2
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
3 This is the place to add tests for changes to 2to3's grammar, such as those
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
4 merging the grammars for Python 2 and 3. In addition to specific tests for
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
5 parts of the grammar we've changed, we also make sure we can parse the
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
6 test_grammar.py files from both Python 2 and Python 3.
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
7 """
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
8
61422
e435888b8825 Merged revisions 80936 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 59939
diff changeset
9 from __future__ import with_statement
e435888b8825 Merged revisions 80936 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 59939
diff changeset
10
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
11 # Testing imports
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
12 from . import support
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
13 from .support import driver, test_dir
75320
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
14 from test.support import verbose
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
15
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
16 # Python imports
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
17 import os
75320
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
18 import sys
72801
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
19 import unittest
75320
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
20 import warnings
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
21 import subprocess
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
22
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
23 # Local imports
53961
5702d2dad0f9 Merged revisions 72494 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 45911
diff changeset
24 from lib2to3.pgen2 import tokenize
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
25 from ..pgen2.parse import ParseError
72801
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
26 from lib2to3.pygram import python_symbols as syms
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
27
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
28
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
29 class TestDriver(support.TestCase):
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
30
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
31 def test_formfeed(self):
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
32 s = """print 1\n\x0Cprint 2\n"""
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
33 t = driver.parse_string(s)
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
34 self.assertEqual(t.children[0].children[0].type, syms.print_stmt)
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
35 self.assertEqual(t.children[1].children[0].type, syms.print_stmt)
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
36
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
37
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
38 class GrammarTest(support.TestCase):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
39 def validate(self, code):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
40 support.parse_string(code)
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
41
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
42 def invalid_syntax(self, code):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
43 try:
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
44 self.validate(code)
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
45 except ParseError:
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
46 pass
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
47 else:
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
48 raise AssertionError("Syntax shouldn't have been valid")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
49
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
50
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
51 class TestRaiseChanges(GrammarTest):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
52 def test_2x_style_1(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
53 self.validate("raise")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
54
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
55 def test_2x_style_2(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
56 self.validate("raise E, V")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
57
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
58 def test_2x_style_3(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
59 self.validate("raise E, V, T")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
60
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
61 def test_2x_style_invalid_1(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
62 self.invalid_syntax("raise E, V, T, Z")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
63
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
64 def test_3x_style(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
65 self.validate("raise E1 from E2")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
66
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
67 def test_3x_style_invalid_1(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
68 self.invalid_syntax("raise E, V from E1")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
69
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
70 def test_3x_style_invalid_2(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
71 self.invalid_syntax("raise E from E1, E2")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
72
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
73 def test_3x_style_invalid_3(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
74 self.invalid_syntax("raise from E1, E2")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
75
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
76 def test_3x_style_invalid_4(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
77 self.invalid_syntax("raise E from")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
78
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
79
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
80 # Adapated from Python 3's Lib/test/test_grammar.py:GrammarTests.testFuncdef
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
81 class TestFunctionAnnotations(GrammarTest):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
82 def test_1(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
83 self.validate("""def f(x) -> list: pass""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
84
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
85 def test_2(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
86 self.validate("""def f(x:int): pass""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
87
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
88 def test_3(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
89 self.validate("""def f(*x:str): pass""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
90
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
91 def test_4(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
92 self.validate("""def f(**x:float): pass""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
93
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
94 def test_5(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
95 self.validate("""def f(x, y:1+2): pass""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
96
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
97 def test_6(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
98 self.validate("""def f(a, (b:1, c:2, d)): pass""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
99
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
100 def test_7(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
101 self.validate("""def f(a, (b:1, c:2, d), e:3=4, f=5, *g:6): pass""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
102
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
103 def test_8(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
104 s = """def f(a, (b:1, c:2, d), e:3=4, f=5,
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
105 *g:6, h:7, i=8, j:9=10, **k:11) -> 12: pass"""
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
106 self.validate(s)
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
107
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
108
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
109 class TestExcept(GrammarTest):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
110 def test_new(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
111 s = """
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
112 try:
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
113 x
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
114 except E as N:
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
115 y"""
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
116 self.validate(s)
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
117
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
118 def test_old(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
119 s = """
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
120 try:
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
121 x
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
122 except E, N:
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
123 y"""
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
124 self.validate(s)
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
125
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
126
45910
1da2499683b4 Merged revisions 61602 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents: 45908
diff changeset
127 # Adapted from Python 3's Lib/test/test_grammar.py:GrammarTests.testAtoms
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
128 class TestSetLiteral(GrammarTest):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
129 def test_1(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
130 self.validate("""x = {'one'}""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
131
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
132 def test_2(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
133 self.validate("""x = {'one', 1,}""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
134
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
135 def test_3(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
136 self.validate("""x = {'one', 'two', 'three'}""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
137
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
138 def test_4(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
139 self.validate("""x = {2, 3, 4,}""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
140
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
141
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
142 class TestNumericLiterals(GrammarTest):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
143 def test_new_octal_notation(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
144 self.validate("""0o7777777777777""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
145 self.invalid_syntax("""0o7324528887""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
146
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
147 def test_new_binary_notation(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
148 self.validate("""0b101010""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
149 self.invalid_syntax("""0b0101021""")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
150
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
151
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
152 class TestClassDef(GrammarTest):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
153 def test_new_syntax(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
154 self.validate("class B(t=7): pass")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
155 self.validate("class B(t, *args): pass")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
156 self.validate("class B(t, **kwargs): pass")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
157 self.validate("class B(t, *args, **kwargs): pass")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
158 self.validate("class B(t, y=9, *args, **kwargs): pass")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
159
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
160
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
161 class TestParserIdempotency(support.TestCase):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
162
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
163 """A cut-down version of pytree_idempotency.py."""
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
164
72801
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
165 # Issue 13125
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
166 @unittest.expectedFailure
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
167 def test_all_project_files(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
168 for filepath in support.all_project_files():
53961
5702d2dad0f9 Merged revisions 72494 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 45911
diff changeset
169 with open(filepath, "rb") as fp:
5702d2dad0f9 Merged revisions 72494 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 45911
diff changeset
170 encoding = tokenize.detect_encoding(fp.readline)[0]
61422
e435888b8825 Merged revisions 80936 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 59939
diff changeset
171 self.assertTrue(encoding is not None,
e435888b8825 Merged revisions 80936 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 59939
diff changeset
172 "can't detect encoding for %s" % filepath)
72801
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
173 with open(filepath, "r", encoding=encoding) as fp:
53961
5702d2dad0f9 Merged revisions 72494 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 45911
diff changeset
174 source = fp.read()
72801
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
175 try:
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
176 tree = driver.parse_string(source)
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
177 except ParseError as err:
75320
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
178 if verbose > 0:
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
179 warnings.warn('ParseError on file %s (%s)' % (filepath, err))
72801
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
180 continue
53961
5702d2dad0f9 Merged revisions 72494 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 45911
diff changeset
181 new = str(tree)
75320
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
182 x = diff(filepath, new)
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
183 if x:
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
184 self.fail("Idempotency failed: %s" % filepath)
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
185
57080
a8086b314cd0 Merged revisions 76063,76068 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54709
diff changeset
186 def test_extended_unpacking(self):
a8086b314cd0 Merged revisions 76063,76068 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54709
diff changeset
187 driver.parse_string("a, *b, c = x\n")
a8086b314cd0 Merged revisions 76063,76068 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54709
diff changeset
188 driver.parse_string("[*a, b] = x\n")
a8086b314cd0 Merged revisions 76063,76068 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54709
diff changeset
189 driver.parse_string("(z, *y, w) = m\n")
a8086b314cd0 Merged revisions 76063,76068 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 54709
diff changeset
190 driver.parse_string("for *z, m in d: pass\n")
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
191
75320
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
192
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
193 class TestLiterals(GrammarTest):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
194
53961
5702d2dad0f9 Merged revisions 72494 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 45911
diff changeset
195 def validate(self, s):
5702d2dad0f9 Merged revisions 72494 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 45911
diff changeset
196 driver.parse_string(support.dedent(s) + "\n\n")
5702d2dad0f9 Merged revisions 72494 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 45911
diff changeset
197
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
198 def test_multiline_bytes_literals(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
199 s = """
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
200 md5test(b"\xaa" * 80,
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
201 (b"Test Using Larger Than Block-Size Key "
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
202 b"and Larger Than One Block-Size Data"),
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
203 "6f630fad67cda0ee1fb1f562db3aa53e")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
204 """
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
205 self.validate(s)
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
206
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
207 def test_multiline_bytes_tripquote_literals(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
208 s = '''
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
209 b"""
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
210 <?xml version="1.0" encoding="UTF-8"?>
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
211 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN">
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
212 """
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
213 '''
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
214 self.validate(s)
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
215
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
216 def test_multiline_str_literals(self):
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
217 s = """
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
218 md5test("\xaa" * 80,
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
219 ("Test Using Larger Than Block-Size Key "
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
220 "and Larger Than One Block-Size Data"),
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
221 "6f630fad67cda0ee1fb1f562db3aa53e")
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
222 """
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
223 self.validate(s)
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
224
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
225
72801
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
226 def diff(fn, result):
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
227 try:
72801
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
228 with open('@', 'w') as f:
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
229 f.write(str(result))
59939
8e76e46c1994 Merged revisions 79327 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents: 58588
diff changeset
230 fn = fn.replace('"', '\\"')
75320
2fd68efac05a Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Antoine Pitrou <solipsis@pitrou.net>
parents: 72801
diff changeset
231 return subprocess.call(['diff', '-u', fn, '@'], stdout=(subprocess.DEVNULL if verbose < 1 else None))
45908
963d67df3723 Merged revisions 61596-61597 via svnmerge from
Martin v. Löwis <martin@v.loewis.de>
parents:
diff changeset
232 finally:
72801
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
233 try:
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
234 os.remove("@")
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
235 except OSError:
6e0e9237d8e8 - Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
Barry Warsaw <barry@python.org>
parents: 68257
diff changeset
236 pass