Staging
v0.5.1
v0.5.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
Tip revision: 14e976e00e65bf343ba0fca016c3c9132a843daf authored by Eric Appelt on 30 January 2018, 07:13:03 UTC
closes bpo-30117: fix lib2to3 ParserIdempotency test (GH-1242)
closes bpo-30117: fix lib2to3 ParserIdempotency test (GH-1242)
Tip revision: 14e976e
File | Mode | Size |
---|---|---|
bdist_wininst | ||
clinic | ||
external | ||
icons | ||
WinMain.c | -rw-r--r-- | 449 bytes |
_findvs.cpp | -rw-r--r-- | 6.5 KB |
_msi.c | -rw-r--r-- | 32.1 KB |
_testconsole.c | -rw-r--r-- | 3.3 KB |
config.c | -rw-r--r-- | 5.1 KB |
dl_nt.c | -rw-r--r-- | 4.6 KB |
empty.c | -rw-r--r-- | 137 bytes |
errmap.h | -rw-r--r-- | 2.1 KB |
errmap.mak | -rw-r--r-- | 95 bytes |
frozen_dllmain.c | -rw-r--r-- | 3.9 KB |
generrmap.c | -rw-r--r-- | 849 bytes |
getpathp.c | -rw-r--r-- | 31.9 KB |
invalid_parameter_handler.c | -rw-r--r-- | 549 bytes |
launcher.c | -rw-r--r-- | 53.6 KB |
msvcrtmodule.c | -rw-r--r-- | 15.3 KB |
pyconfig.h | -rw-r--r-- | 19.9 KB |
pylauncher.rc | -rw-r--r-- | 1.4 KB |
pyshellext.cpp | -rw-r--r-- | 18.1 KB |
pyshellext.def | -rw-r--r-- | 141 bytes |
pyshellext.idl | -rw-r--r-- | 277 bytes |
pyshellext.rc | -rw-r--r-- | 1.1 KB |
pyshellext_d.def | -rw-r--r-- | 143 bytes |
python.manifest | -rw-r--r-- | 1.3 KB |
python3.def | -rw-r--r-- | 40.4 KB |
python3dll.c | -rw-r--r-- | 134 bytes |
python_exe.rc | -rw-r--r-- | 1.2 KB |
python_nt.rc | -rw-r--r-- | 1.2 KB |
python_ver_rc.h | -rw-r--r-- | 970 bytes |
pythonw_exe.rc | -rw-r--r-- | 1.2 KB |
readme.txt | -rw-r--r-- | 3.5 KB |
sqlite3.rc | -rw-r--r-- | 1.3 KB |
testpy.py | -rw-r--r-- | 831 bytes |
validate_ucrtbase.py | -rw-r--r-- | 2.7 KB |
winreg.c | -rw-r--r-- | 59.7 KB |
winsound.c | -rw-r--r-- | 6.5 KB |
Computing file changes ...