Staging
v0.8.1
https://github.com/python/cpython
Revision 14e976e00e65bf343ba0fca016c3c9132a843daf authored by Eric Appelt on 30 January 2018, 07:13:03 UTC, committed by Benjamin Peterson on 30 January 2018, 07:13:03 UTC
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.
1 parent ce0f33d
History
Tip revision: 14e976e00e65bf343ba0fca016c3c9132a843daf authored by Eric Appelt on 30 January 2018, 07:13:03 UTC
closes bpo-30117: fix lib2to3 ParserIdempotency test (GH-1242)
Tip revision: 14e976e
File Mode Size
Python.asdl -rw-r--r-- 5.2 KB
acceler.c -rw-r--r-- 3.3 KB
asdl.py -rw-r--r-- 12.6 KB
asdl_c.py -rw-r--r-- 43.2 KB
bitset.c -rw-r--r-- 1.0 KB
firstsets.c -rw-r--r-- 2.8 KB
grammar.c -rw-r--r-- 7.4 KB
grammar1.c -rw-r--r-- 1.3 KB
listnode.c -rw-r--r-- 1.3 KB
metagrammar.c -rw-r--r-- 2.4 KB
myreadline.c -rw-r--r-- 9.6 KB
node.c -rw-r--r-- 4.4 KB
parser.c -rw-r--r-- 11.6 KB
parser.h -rw-r--r-- 1.2 KB
parsetok.c -rw-r--r-- 10.6 KB
parsetok_pgen.c -rw-r--r-- 35 bytes
pgen.c -rw-r--r-- 17.9 KB
pgenmain.c -rw-r--r-- 4.0 KB
printgrammar.c -rw-r--r-- 2.9 KB
tokenizer.c -rw-r--r-- 51.6 KB
tokenizer.h -rw-r--r-- 3.1 KB
tokenizer_pgen.c -rw-r--r-- 36 bytes

back to top