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.
|
|
|
|
"""
|
|
|
|
|
Merged revisions 80934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r80934 | benjamin.peterson | 2010-05-07 13:58:23 -0500 (Fri, 07 May 2010) | 69 lines
Merged revisions 79911,79916-79917,80018,80418,80572-80573,80635-80639,80668,80922 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r79911 | benjamin.peterson | 2010-04-09 15:38:53 -0500 (Fri, 09 Apr 2010) | 1 line
use absolute import
........
r79916 | benjamin.peterson | 2010-04-09 16:05:21 -0500 (Fri, 09 Apr 2010) | 1 line
generalize detection of __future__ imports and attach them to the tree
........
r79917 | benjamin.peterson | 2010-04-09 16:11:44 -0500 (Fri, 09 Apr 2010) | 1 line
don't try to 'fix' relative imports when absolute_import is enabled #8858
........
r80018 | benjamin.peterson | 2010-04-12 16:12:12 -0500 (Mon, 12 Apr 2010) | 4 lines
prevent diffs from being mangled is multiprocess mode #6409
Patch by George Boutsioukis.
........
r80418 | benjamin.peterson | 2010-04-23 16:00:03 -0500 (Fri, 23 Apr 2010) | 1 line
remove unhelpful description
........
r80572 | benjamin.peterson | 2010-04-27 20:33:54 -0500 (Tue, 27 Apr 2010) | 1 line
use unicode literals
........
r80573 | jeffrey.yasskin | 2010-04-27 23:08:27 -0500 (Tue, 27 Apr 2010) | 6 lines
Don't transform imports that are already relative. 2to3 turned
from . import refactor
into
from .. import refactor
which broke the transformation of 2to3 itself.
........
r80635 | benjamin.peterson | 2010-04-29 16:02:23 -0500 (Thu, 29 Apr 2010) | 1 line
remove imports
........
r80636 | benjamin.peterson | 2010-04-29 16:02:41 -0500 (Thu, 29 Apr 2010) | 1 line
unicode literal
........
r80637 | benjamin.peterson | 2010-04-29 16:03:42 -0500 (Thu, 29 Apr 2010) | 1 line
must pass a string to Number
........
r80638 | benjamin.peterson | 2010-04-29 16:05:34 -0500 (Thu, 29 Apr 2010) | 1 line
unicode literals
........
r80639 | benjamin.peterson | 2010-04-29 16:06:09 -0500 (Thu, 29 Apr 2010) | 1 line
pass string to Number
........
r80668 | jeffrey.yasskin | 2010-04-30 18:02:47 -0500 (Fri, 30 Apr 2010) | 4 lines
Make 2to3 run under Python 2.5 so that the benchmark suite at
http://hg.python.org/benchmarks/ can use it and still run on implementations
that haven't gotten to 2.6 yet. Fixes issue 8566.
........
r80922 | benjamin.peterson | 2010-05-07 11:06:25 -0500 (Fri, 07 May 2010) | 1 line
prevent xrange transformation from wrapping range calls it produces in list
........
................
2010-05-07 16:10:11 -03:00
|
|
|
from __future__ import with_statement
|
|
|
|
|
2008-03-19 02:04:44 -03:00
|
|
|
# Testing imports
|
|
|
|
from . import support
|
|
|
|
from .support import driver, test_dir
|
2012-02-27 14:55:36 -04:00
|
|
|
from test.support import verbose
|
2008-03-19 02:04:44 -03:00
|
|
|
|
|
|
|
# Python imports
|
|
|
|
import os
|
2012-02-27 14:55:36 -04:00
|
|
|
import sys
|
2011-10-07 15:44:49 -03:00
|
|
|
import unittest
|
2012-02-27 14:55:36 -04:00
|
|
|
import warnings
|
|
|
|
import subprocess
|
2008-03-19 02:04:44 -03:00
|
|
|
|
|
|
|
# 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
|
2011-10-07 15:44:49 -03:00
|
|
|
from lib2to3.pygram import python_symbols as syms
|
|
|
|
|
|
|
|
|
|
|
|
class TestDriver(support.TestCase):
|
|
|
|
|
|
|
|
def test_formfeed(self):
|
|
|
|
s = """print 1\n\x0Cprint 2\n"""
|
|
|
|
t = driver.parse_string(s)
|
|
|
|
self.assertEqual(t.children[0].children[0].type, syms.print_stmt)
|
|
|
|
self.assertEqual(t.children[1].children[0].type, syms.print_stmt)
|
2008-03-19 02:04:44 -03:00
|
|
|
|
|
|
|
|
|
|
|
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."""
|
|
|
|
|
2011-10-07 15:44:49 -03:00
|
|
|
# Issue 13125
|
|
|
|
@unittest.expectedFailure
|
2008-03-19 02:04:44 -03:00
|
|
|
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]
|
Merged revisions 80934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r80934 | benjamin.peterson | 2010-05-07 13:58:23 -0500 (Fri, 07 May 2010) | 69 lines
Merged revisions 79911,79916-79917,80018,80418,80572-80573,80635-80639,80668,80922 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r79911 | benjamin.peterson | 2010-04-09 15:38:53 -0500 (Fri, 09 Apr 2010) | 1 line
use absolute import
........
r79916 | benjamin.peterson | 2010-04-09 16:05:21 -0500 (Fri, 09 Apr 2010) | 1 line
generalize detection of __future__ imports and attach them to the tree
........
r79917 | benjamin.peterson | 2010-04-09 16:11:44 -0500 (Fri, 09 Apr 2010) | 1 line
don't try to 'fix' relative imports when absolute_import is enabled #8858
........
r80018 | benjamin.peterson | 2010-04-12 16:12:12 -0500 (Mon, 12 Apr 2010) | 4 lines
prevent diffs from being mangled is multiprocess mode #6409
Patch by George Boutsioukis.
........
r80418 | benjamin.peterson | 2010-04-23 16:00:03 -0500 (Fri, 23 Apr 2010) | 1 line
remove unhelpful description
........
r80572 | benjamin.peterson | 2010-04-27 20:33:54 -0500 (Tue, 27 Apr 2010) | 1 line
use unicode literals
........
r80573 | jeffrey.yasskin | 2010-04-27 23:08:27 -0500 (Tue, 27 Apr 2010) | 6 lines
Don't transform imports that are already relative. 2to3 turned
from . import refactor
into
from .. import refactor
which broke the transformation of 2to3 itself.
........
r80635 | benjamin.peterson | 2010-04-29 16:02:23 -0500 (Thu, 29 Apr 2010) | 1 line
remove imports
........
r80636 | benjamin.peterson | 2010-04-29 16:02:41 -0500 (Thu, 29 Apr 2010) | 1 line
unicode literal
........
r80637 | benjamin.peterson | 2010-04-29 16:03:42 -0500 (Thu, 29 Apr 2010) | 1 line
must pass a string to Number
........
r80638 | benjamin.peterson | 2010-04-29 16:05:34 -0500 (Thu, 29 Apr 2010) | 1 line
unicode literals
........
r80639 | benjamin.peterson | 2010-04-29 16:06:09 -0500 (Thu, 29 Apr 2010) | 1 line
pass string to Number
........
r80668 | jeffrey.yasskin | 2010-04-30 18:02:47 -0500 (Fri, 30 Apr 2010) | 4 lines
Make 2to3 run under Python 2.5 so that the benchmark suite at
http://hg.python.org/benchmarks/ can use it and still run on implementations
that haven't gotten to 2.6 yet. Fixes issue 8566.
........
r80922 | benjamin.peterson | 2010-05-07 11:06:25 -0500 (Fri, 07 May 2010) | 1 line
prevent xrange transformation from wrapping range calls it produces in list
........
................
2010-05-07 16:10:11 -03:00
|
|
|
self.assertTrue(encoding is not None,
|
|
|
|
"can't detect encoding for %s" % filepath)
|
2011-10-07 15:44:49 -03:00
|
|
|
with open(filepath, "r", encoding=encoding) as fp:
|
2009-05-09 16:42:23 -03:00
|
|
|
source = fp.read()
|
2011-10-07 15:44:49 -03:00
|
|
|
try:
|
|
|
|
tree = driver.parse_string(source)
|
|
|
|
except ParseError as err:
|
2012-02-27 14:55:36 -04:00
|
|
|
if verbose > 0:
|
|
|
|
warnings.warn('ParseError on file %s (%s)' % (filepath, err))
|
2011-10-07 15:44:49 -03:00
|
|
|
continue
|
2009-05-09 16:42:23 -03:00
|
|
|
new = str(tree)
|
2012-02-27 14:55:36 -04:00
|
|
|
x = diff(filepath, new)
|
|
|
|
if x:
|
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
|
|
|
|
2012-02-27 14:55:36 -04:00
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
2011-10-07 15:44:49 -03:00
|
|
|
def diff(fn, result):
|
2008-03-19 02:04:44 -03:00
|
|
|
try:
|
2011-10-07 15:44:49 -03:00
|
|
|
with open('@', 'w') as f:
|
|
|
|
f.write(str(result))
|
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('"', '\\"')
|
2012-02-27 14:55:36 -04:00
|
|
|
return subprocess.call(['diff', '-u', fn, '@'], stdout=(subprocess.DEVNULL if verbose < 1 else None))
|
2008-03-19 02:04:44 -03:00
|
|
|
finally:
|
2011-10-07 15:44:49 -03:00
|
|
|
try:
|
|
|
|
os.remove("@")
|
|
|
|
except OSError:
|
|
|
|
pass
|