2008-03-19 02:04:44 -03:00
|
|
|
"""Test suite for 2to3's parser and grammar files.
|
|
|
|
|
|
|
|
This is the place to add tests for changes to 2to3's grammar, such as those
|
|
|
|
merging the grammars for Python 2 and 3. In addition to specific tests for
|
|
|
|
parts of the grammar we've changed, we also make sure we can parse the
|
|
|
|
test_grammar.py files from both Python 2 and Python 3.
|
|
|
|
"""
|
|
|
|
|
|
|
|
# Testing imports
|
|
|
|
from . import support
|
|
|
|
from .support import driver, test_dir
|
|
|
|
|
|
|
|
# Python imports
|
|
|
|
import os
|
|
|
|
|
|
|
|
# Local imports
|
2009-05-09 16:42:23 -03:00
|
|
|
from lib2to3.pgen2 import tokenize
|
2008-03-19 02:04:44 -03:00
|
|
|
from ..pgen2.parse import ParseError
|
|
|
|
|
|
|
|
|
|
|
|
class GrammarTest(support.TestCase):
|
|
|
|
def validate(self, code):
|
|
|
|
support.parse_string(code)
|
|
|
|
|
|
|
|
def invalid_syntax(self, code):
|
|
|
|
try:
|
|
|
|
self.validate(code)
|
|
|
|
except ParseError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
raise AssertionError("Syntax shouldn't have been valid")
|
|
|
|
|
|
|
|
|
|
|
|
class TestRaiseChanges(GrammarTest):
|
|
|
|
def test_2x_style_1(self):
|
|
|
|
self.validate("raise")
|
|
|
|
|
|
|
|
def test_2x_style_2(self):
|
|
|
|
self.validate("raise E, V")
|
|
|
|
|
|
|
|
def test_2x_style_3(self):
|
|
|
|
self.validate("raise E, V, T")
|
|
|
|
|
|
|
|
def test_2x_style_invalid_1(self):
|
|
|
|
self.invalid_syntax("raise E, V, T, Z")
|
|
|
|
|
|
|
|
def test_3x_style(self):
|
|
|
|
self.validate("raise E1 from E2")
|
|
|
|
|
|
|
|
def test_3x_style_invalid_1(self):
|
|
|
|
self.invalid_syntax("raise E, V from E1")
|
|
|
|
|
|
|
|
def test_3x_style_invalid_2(self):
|
|
|
|
self.invalid_syntax("raise E from E1, E2")
|
|
|
|
|
|
|
|
def test_3x_style_invalid_3(self):
|
|
|
|
self.invalid_syntax("raise from E1, E2")
|
|
|
|
|
|
|
|
def test_3x_style_invalid_4(self):
|
|
|
|
self.invalid_syntax("raise E from")
|
|
|
|
|
|
|
|
|
|
|
|
# Adapated from Python 3's Lib/test/test_grammar.py:GrammarTests.testFuncdef
|
|
|
|
class TestFunctionAnnotations(GrammarTest):
|
|
|
|
def test_1(self):
|
|
|
|
self.validate("""def f(x) -> list: pass""")
|
|
|
|
|
|
|
|
def test_2(self):
|
|
|
|
self.validate("""def f(x:int): pass""")
|
|
|
|
|
|
|
|
def test_3(self):
|
|
|
|
self.validate("""def f(*x:str): pass""")
|
|
|
|
|
|
|
|
def test_4(self):
|
|
|
|
self.validate("""def f(**x:float): pass""")
|
|
|
|
|
|
|
|
def test_5(self):
|
|
|
|
self.validate("""def f(x, y:1+2): pass""")
|
|
|
|
|
|
|
|
def test_6(self):
|
|
|
|
self.validate("""def f(a, (b:1, c:2, d)): pass""")
|
|
|
|
|
|
|
|
def test_7(self):
|
|
|
|
self.validate("""def f(a, (b:1, c:2, d), e:3=4, f=5, *g:6): pass""")
|
|
|
|
|
|
|
|
def test_8(self):
|
|
|
|
s = """def f(a, (b:1, c:2, d), e:3=4, f=5,
|
|
|
|
*g:6, h:7, i=8, j:9=10, **k:11) -> 12: pass"""
|
|
|
|
self.validate(s)
|
|
|
|
|
|
|
|
|
|
|
|
class TestExcept(GrammarTest):
|
|
|
|
def test_new(self):
|
|
|
|
s = """
|
|
|
|
try:
|
|
|
|
x
|
|
|
|
except E as N:
|
|
|
|
y"""
|
|
|
|
self.validate(s)
|
|
|
|
|
|
|
|
def test_old(self):
|
|
|
|
s = """
|
|
|
|
try:
|
|
|
|
x
|
|
|
|
except E, N:
|
|
|
|
y"""
|
|
|
|
self.validate(s)
|
|
|
|
|
|
|
|
|
2008-03-19 02:26:18 -03:00
|
|
|
# Adapted from Python 3's Lib/test/test_grammar.py:GrammarTests.testAtoms
|
2008-03-19 02:04:44 -03:00
|
|
|
class TestSetLiteral(GrammarTest):
|
|
|
|
def test_1(self):
|
|
|
|
self.validate("""x = {'one'}""")
|
|
|
|
|
|
|
|
def test_2(self):
|
|
|
|
self.validate("""x = {'one', 1,}""")
|
|
|
|
|
|
|
|
def test_3(self):
|
|
|
|
self.validate("""x = {'one', 'two', 'three'}""")
|
|
|
|
|
|
|
|
def test_4(self):
|
|
|
|
self.validate("""x = {2, 3, 4,}""")
|
|
|
|
|
|
|
|
|
|
|
|
class TestNumericLiterals(GrammarTest):
|
|
|
|
def test_new_octal_notation(self):
|
|
|
|
self.validate("""0o7777777777777""")
|
|
|
|
self.invalid_syntax("""0o7324528887""")
|
|
|
|
|
|
|
|
def test_new_binary_notation(self):
|
|
|
|
self.validate("""0b101010""")
|
|
|
|
self.invalid_syntax("""0b0101021""")
|
|
|
|
|
|
|
|
|
|
|
|
class TestClassDef(GrammarTest):
|
|
|
|
def test_new_syntax(self):
|
|
|
|
self.validate("class B(t=7): pass")
|
|
|
|
self.validate("class B(t, *args): pass")
|
|
|
|
self.validate("class B(t, **kwargs): pass")
|
|
|
|
self.validate("class B(t, *args, **kwargs): pass")
|
|
|
|
self.validate("class B(t, y=9, *args, **kwargs): pass")
|
|
|
|
|
|
|
|
|
|
|
|
class TestParserIdempotency(support.TestCase):
|
|
|
|
|
|
|
|
"""A cut-down version of pytree_idempotency.py."""
|
|
|
|
|
|
|
|
def test_all_project_files(self):
|
|
|
|
for filepath in support.all_project_files():
|
2009-05-09 16:42:23 -03:00
|
|
|
with open(filepath, "rb") as fp:
|
|
|
|
encoding = tokenize.detect_encoding(fp.readline)[0]
|
|
|
|
fp.seek(0)
|
|
|
|
source = fp.read()
|
|
|
|
if encoding:
|
|
|
|
source = source.decode(encoding)
|
|
|
|
tree = driver.parse_string(source)
|
|
|
|
new = str(tree)
|
|
|
|
if encoding:
|
|
|
|
new = new.encode(encoding)
|
|
|
|
if diff(filepath, new):
|
2008-03-19 02:04:44 -03:00
|
|
|
self.fail("Idempotency failed: %s" % filepath)
|
|
|
|
|
Merged revisions 76062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r76062 | benjamin.peterson | 2009-11-02 12:12:12 -0600 (Mon, 02 Nov 2009) | 70 lines
Merged revisions 74359,75081,75088,75213,75278,75303,75427-75428,75734-75736,75865,76059-76061 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r74359 | benjamin.peterson | 2009-08-12 17:23:13 -0500 (Wed, 12 Aug 2009) | 1 line
don't pass the deprecated print_function option
........
r75081 | benjamin.peterson | 2009-09-26 22:02:57 -0500 (Sat, 26 Sep 2009) | 1 line
let 2to3 work with extended iterable unpacking
........
r75088 | benjamin.peterson | 2009-09-27 11:25:21 -0500 (Sun, 27 Sep 2009) | 1 line
look on the type only for __call__
........
r75213 | benjamin.peterson | 2009-10-03 10:09:46 -0500 (Sat, 03 Oct 2009) | 5 lines
revert 75212; it's not correct
People can use isinstance(x, collections.Callable) if they expect objects with
__call__ in their instance dictionaries.
........
r75278 | benjamin.peterson | 2009-10-07 16:25:56 -0500 (Wed, 07 Oct 2009) | 4 lines
fix whitespace problems with fix_idioms #3563
Patch by Joe Amenta.
........
r75303 | benjamin.peterson | 2009-10-09 16:59:11 -0500 (Fri, 09 Oct 2009) | 1 line
port latin-1 and utf-8 cookie improvements
........
r75427 | benjamin.peterson | 2009-10-14 20:35:57 -0500 (Wed, 14 Oct 2009) | 1 line
force floor division
........
r75428 | benjamin.peterson | 2009-10-14 20:39:21 -0500 (Wed, 14 Oct 2009) | 1 line
silence -3 warnings about __hash__
........
r75734 | benjamin.peterson | 2009-10-26 16:25:53 -0500 (Mon, 26 Oct 2009) | 2 lines
warn on map(None, ...) with more than 2 arguments #7203
........
r75735 | benjamin.peterson | 2009-10-26 16:28:25 -0500 (Mon, 26 Oct 2009) | 1 line
remove unused result
........
r75736 | benjamin.peterson | 2009-10-26 16:29:02 -0500 (Mon, 26 Oct 2009) | 1 line
using get() here is a bit pointless
........
r75865 | benjamin.peterson | 2009-10-27 15:49:00 -0500 (Tue, 27 Oct 2009) | 1 line
explain reason for warning
........
r76059 | benjamin.peterson | 2009-11-02 11:43:47 -0600 (Mon, 02 Nov 2009) | 1 line
tuples are no longer used for children
........
r76060 | benjamin.peterson | 2009-11-02 11:55:40 -0600 (Mon, 02 Nov 2009) | 1 line
revert r76059; apparently some fixers rely on Leaf no () for children
........
r76061 | benjamin.peterson | 2009-11-02 12:06:17 -0600 (Mon, 02 Nov 2009) | 1 line
make fix_tuple_params keep the tree valid #7253
........
................
2009-11-02 14:16:28 -04:00
|
|
|
def test_extended_unpacking(self):
|
|
|
|
driver.parse_string("a, *b, c = x\n")
|
|
|
|
driver.parse_string("[*a, b] = x\n")
|
|
|
|
driver.parse_string("(z, *y, w) = m\n")
|
|
|
|
driver.parse_string("for *z, m in d: pass\n")
|
2008-03-19 02:04:44 -03:00
|
|
|
|
|
|
|
class TestLiterals(GrammarTest):
|
|
|
|
|
2009-05-09 16:42:23 -03:00
|
|
|
def validate(self, s):
|
|
|
|
driver.parse_string(support.dedent(s) + "\n\n")
|
|
|
|
|
2008-03-19 02:04:44 -03:00
|
|
|
def test_multiline_bytes_literals(self):
|
|
|
|
s = """
|
|
|
|
md5test(b"\xaa" * 80,
|
|
|
|
(b"Test Using Larger Than Block-Size Key "
|
|
|
|
b"and Larger Than One Block-Size Data"),
|
|
|
|
"6f630fad67cda0ee1fb1f562db3aa53e")
|
|
|
|
"""
|
|
|
|
self.validate(s)
|
|
|
|
|
|
|
|
def test_multiline_bytes_tripquote_literals(self):
|
|
|
|
s = '''
|
|
|
|
b"""
|
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN">
|
|
|
|
"""
|
|
|
|
'''
|
|
|
|
self.validate(s)
|
|
|
|
|
|
|
|
def test_multiline_str_literals(self):
|
|
|
|
s = """
|
|
|
|
md5test("\xaa" * 80,
|
|
|
|
("Test Using Larger Than Block-Size Key "
|
|
|
|
"and Larger Than One Block-Size Data"),
|
|
|
|
"6f630fad67cda0ee1fb1f562db3aa53e")
|
|
|
|
"""
|
|
|
|
self.validate(s)
|
|
|
|
|
|
|
|
|
2009-05-09 16:42:23 -03:00
|
|
|
def diff(fn, result):
|
Merged revisions 73370 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r73370 | benjamin.peterson | 2009-06-11 17:06:46 -0500 (Thu, 11 Jun 2009) | 105 lines
Merged revisions 72523,72950-72951,72994,73003,73033,73036-73040,73091-73093,73096,73179-73181,73192,73231,73244,73255-73256,73365 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r72523 | benjamin.peterson | 2009-05-09 14:42:26 -0500 (Sat, 09 May 2009) | 1 line
remove parenthesis
........
r72950 | benjamin.peterson | 2009-05-26 18:19:45 -0500 (Tue, 26 May 2009) | 1 line
remove unused imports
........
r72951 | benjamin.peterson | 2009-05-26 18:27:00 -0500 (Tue, 26 May 2009) | 1 line
this is no longer executable
........
r72994 | benjamin.peterson | 2009-05-28 15:32:54 -0500 (Thu, 28 May 2009) | 1 line
fix test_all_fixers on Windows #6134
........
r73003 | benjamin.peterson | 2009-05-28 21:57:28 -0500 (Thu, 28 May 2009) | 4 lines
make 2to3 test utilities easier to use with other applications (3to2)
Patch by Joe Amenta
........
r73033 | benjamin.peterson | 2009-05-29 16:58:32 -0500 (Fri, 29 May 2009) | 1 line
update grammar for multi with statement
........
r73036 | benjamin.peterson | 2009-05-29 17:33:20 -0500 (Fri, 29 May 2009) | 1 line
simplify fix_unicode
........
r73037 | benjamin.peterson | 2009-05-29 17:53:03 -0500 (Fri, 29 May 2009) | 1 line
add custom error for pattern syntax errors
........
r73038 | benjamin.peterson | 2009-05-29 17:55:00 -0500 (Fri, 29 May 2009) | 1 line
complain if details are attached to a token
........
r73039 | benjamin.peterson | 2009-05-29 18:00:28 -0500 (Fri, 29 May 2009) | 1 line
add a test for whitespace
........
r73040 | benjamin.peterson | 2009-05-29 18:01:17 -0500 (Fri, 29 May 2009) | 1 line
a fix for emacs highlighting
........
r73091 | benjamin.peterson | 2009-05-31 20:55:25 -0500 (Sun, 31 May 2009) | 1 line
deprecate set_prefix() and get_prefix() in favor of a prefix property
........
r73092 | benjamin.peterson | 2009-05-31 21:00:51 -0500 (Sun, 31 May 2009) | 1 line
change hideous java naming scheme
........
r73093 | benjamin.peterson | 2009-05-31 21:01:39 -0500 (Sun, 31 May 2009) | 1 line
remove dated comment
........
r73096 | benjamin.peterson | 2009-05-31 21:40:53 -0500 (Sun, 31 May 2009) | 1 line
group tests
........
r73179 | benjamin.peterson | 2009-06-03 13:09:53 -0500 (Wed, 03 Jun 2009) | 1 line
handle the case where there's multiple trailers #6185
........
r73180 | benjamin.peterson | 2009-06-03 13:18:05 -0500 (Wed, 03 Jun 2009) | 1 line
scrap __main__ section
........
r73181 | benjamin.peterson | 2009-06-03 13:24:48 -0500 (Wed, 03 Jun 2009) | 1 line
remove shebang lines and __main__ sections
........
r73192 | benjamin.peterson | 2009-06-03 19:16:30 -0500 (Wed, 03 Jun 2009) | 4 lines
actually test something here
Thanks to Joe Amenta for noticing.y
........
r73231 | benjamin.peterson | 2009-06-04 13:38:50 -0500 (Thu, 04 Jun 2009) | 1 line
remove unused variable
........
r73244 | benjamin.peterson | 2009-06-05 08:39:25 -0500 (Fri, 05 Jun 2009) | 1 line
allow fixers to give different options in setUp
........
r73255 | benjamin.peterson | 2009-06-06 11:23:46 -0500 (Sat, 06 Jun 2009) | 1 line
fix the except fixer on one line suites #6222
........
r73256 | benjamin.peterson | 2009-06-06 11:27:40 -0500 (Sat, 06 Jun 2009) | 1 line
test one-line else and finally clauses
........
r73365 | benjamin.peterson | 2009-06-11 17:01:32 -0500 (Thu, 11 Jun 2009) | 1 line
normalize whitespace
........
................
2009-06-11 20:47:38 -03:00
|
|
|
f = open("@", "wb")
|
2008-03-19 02:04:44 -03:00
|
|
|
try:
|
2009-05-09 16:42:23 -03:00
|
|
|
f.write(result)
|
2008-03-19 02:04:44 -03:00
|
|
|
finally:
|
|
|
|
f.close()
|
|
|
|
try:
|
Merged revisions 79306,79311,79325 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r79306 | benjamin.peterson | 2010-03-22 17:40:06 -0500 (Mon, 22 Mar 2010) | 21 lines
Merged revisions 79077,79137,79304-79305 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r79077 | benjamin.peterson | 2010-03-18 18:05:29 -0500 (Thu, 18 Mar 2010) | 1 line
port detect_encoding improvements from py3k
........
r79137 | benjamin.peterson | 2010-03-20 11:12:53 -0500 (Sat, 20 Mar 2010) | 1 line
add a fixer for setting sys.exitfunc #2356
........
r79304 | benjamin.peterson | 2010-03-22 17:20:22 -0500 (Mon, 22 Mar 2010) | 1 line
fix test_parser when it's run in a path with spaces #7666
........
r79305 | benjamin.peterson | 2010-03-22 17:27:07 -0500 (Mon, 22 Mar 2010) | 1 line
normalize whitespace
........
................
r79311 | benjamin.peterson | 2010-03-22 17:54:42 -0500 (Mon, 22 Mar 2010) | 9 lines
Merged revisions 79309 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r79309 | benjamin.peterson | 2010-03-22 17:50:47 -0500 (Mon, 22 Mar 2010) | 1 line
pass correct symbol in
........
................
r79325 | benjamin.peterson | 2010-03-22 22:03:55 -0500 (Mon, 22 Mar 2010) | 13 lines
Merged revisions 79313,79324 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r79313 | benjamin.peterson | 2010-03-22 17:59:57 -0500 (Mon, 22 Mar 2010) | 1 line
another case where a symbol is needed
........
r79324 | benjamin.peterson | 2010-03-22 21:59:47 -0500 (Mon, 22 Mar 2010) | 1 line
use unicode literals
........
................
2010-03-23 00:22:05 -03:00
|
|
|
fn = fn.replace('"', '\\"')
|
|
|
|
return os.system('diff -u "%s" @' % fn)
|
2008-03-19 02:04:44 -03:00
|
|
|
finally:
|
|
|
|
os.remove("@")
|