mirror of
https://github.com/python/cpython.git
synced 2024-11-30 18:51:15 +01:00
14e976e00e
Fix two (in my opinion) spurious failure conditions in the lib2to3.tests.test_parser.TestParserIdempotency test_parser test.
Use the same encoding found in the initial file to write a temp file for a diff. This retains the BOM if the encoding was initially utf-8-sig.
If the file cannot be parsed using the normal grammar, try again with no print statement which should succeed for valid files using future print_function
For case (1), the driver was correctly handling a BOM in a utf-8 file, but then the test was not writing a comparison file using 'utf-8-sig' to diff against, so the BOM got removed. I don't think that is the fault of the parser, and lib2to3 will retain the BOM.
For case (2), lib2to3 pre-detects the use of from __future__ import print_function or allows the user to force this interpretation with a -p flag, and then selects a different grammar with the print statement removed. That makes the test cases unfair to this test as the driver itself doesn't know which grammar to use. As a minimal fix, the test will try using a grammar with the print statement, and if that fails fall back on a grammar without it. A more thorough handling of the idempotency test would to be to parse all files using both grammars and ignore if one of the two failed but otherwise check both. I didn't think this was necessary but can change.
59 lines
1.9 KiB
Python
59 lines
1.9 KiB
Python
"""Support code for test_*.py files"""
|
|
# Author: Collin Winter
|
|
|
|
# Python imports
|
|
import unittest
|
|
import os
|
|
import os.path
|
|
from textwrap import dedent
|
|
|
|
# Local imports
|
|
from lib2to3 import pytree, refactor
|
|
from lib2to3.pgen2 import driver as pgen2_driver
|
|
|
|
test_dir = os.path.dirname(__file__)
|
|
proj_dir = os.path.normpath(os.path.join(test_dir, ".."))
|
|
grammar_path = os.path.join(test_dir, "..", "Grammar.txt")
|
|
grammar = pgen2_driver.load_grammar(grammar_path)
|
|
grammar_no_print_statement = pgen2_driver.load_grammar(grammar_path)
|
|
del grammar_no_print_statement.keywords["print"]
|
|
driver = pgen2_driver.Driver(grammar, convert=pytree.convert)
|
|
driver_no_print_statement = pgen2_driver.Driver(
|
|
grammar_no_print_statement,
|
|
convert=pytree.convert
|
|
)
|
|
|
|
def parse_string(string):
|
|
return driver.parse_string(reformat(string), debug=True)
|
|
|
|
def run_all_tests(test_mod=None, tests=None):
|
|
if tests is None:
|
|
tests = unittest.TestLoader().loadTestsFromModule(test_mod)
|
|
unittest.TextTestRunner(verbosity=2).run(tests)
|
|
|
|
def reformat(string):
|
|
return dedent(string) + "\n\n"
|
|
|
|
def get_refactorer(fixer_pkg="lib2to3", fixers=None, options=None):
|
|
"""
|
|
A convenience function for creating a RefactoringTool for tests.
|
|
|
|
fixers is a list of fixers for the RefactoringTool to use. By default
|
|
"lib2to3.fixes.*" is used. options is an optional dictionary of options to
|
|
be passed to the RefactoringTool.
|
|
"""
|
|
if fixers is not None:
|
|
fixers = [fixer_pkg + ".fixes.fix_" + fix for fix in fixers]
|
|
else:
|
|
fixers = refactor.get_fixers_from_package(fixer_pkg + ".fixes")
|
|
options = options or {}
|
|
return refactor.RefactoringTool(fixers, options, explicit=True)
|
|
|
|
def all_project_files():
|
|
for dirpath, dirnames, filenames in os.walk(proj_dir):
|
|
for filename in filenames:
|
|
if filename.endswith(".py"):
|
|
yield os.path.join(dirpath, filename)
|
|
|
|
TestCase = unittest.TestCase
|