mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	 8d26b0be6d
			
		
	
	
		8d26b0be6d
		
	
	
	
	
		
			
			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
  ........
................
		
	
			
		
			
				
	
	
		
			215 lines
		
	
	
	
		
			6 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			215 lines
		
	
	
	
		
			6 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| """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.
 | |
| """
 | |
| 
 | |
| from __future__ import with_statement
 | |
| 
 | |
| # Testing imports
 | |
| from . import support
 | |
| from .support import driver, test_dir
 | |
| 
 | |
| # Python imports
 | |
| import os
 | |
| 
 | |
| # Local imports
 | |
| from lib2to3.pgen2 import tokenize
 | |
| 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)
 | |
| 
 | |
| 
 | |
| # Adapted from Python 3's Lib/test/test_grammar.py:GrammarTests.testAtoms
 | |
| 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():
 | |
|             with open(filepath, "rb") as fp:
 | |
|                 encoding = tokenize.detect_encoding(fp.readline)[0]
 | |
|             self.assertTrue(encoding is not None,
 | |
|                             "can't detect encoding for %s" % filepath)
 | |
|             with open(filepath, "r") as fp:
 | |
|                 source = fp.read()
 | |
|                 source = source.decode(encoding)
 | |
|             tree = driver.parse_string(source)
 | |
|             new = str(tree)
 | |
|             if encoding:
 | |
|                 new = new.encode(encoding)
 | |
|             if diff(filepath, new):
 | |
|                 self.fail("Idempotency failed: %s" % filepath)
 | |
| 
 | |
|     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")
 | |
| 
 | |
| class TestLiterals(GrammarTest):
 | |
| 
 | |
|     def validate(self, s):
 | |
|         driver.parse_string(support.dedent(s) + "\n\n")
 | |
| 
 | |
|     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)
 | |
| 
 | |
| 
 | |
| def diff(fn, result, encoding):
 | |
|     f = open("@", "w")
 | |
|     try:
 | |
|         f.write(result.encode(encoding))
 | |
|     finally:
 | |
|         f.close()
 | |
|     try:
 | |
|         fn = fn.replace('"', '\\"')
 | |
|         return os.system('diff -u "%s" @' % fn)
 | |
|     finally:
 | |
|         os.remove("@")
 |