Staging
v0.5.1
v0.5.1
https://github.com/python/cpython
Revision a23a2c555c4187f349276fe2f2ceffa953d0afe9 authored by Benjamin Peterson on 30 January 2018, 18:23:17 UTC, committed by GitHub on 30 January 2018, 18:23:17 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.. (cherry picked from commit 14e976e00e65bf343ba0fca016c3c9132a843daf)
1 parent 6b2bbcc
Tip revision: a23a2c555c4187f349276fe2f2ceffa953d0afe9 authored by Benjamin Peterson on 30 January 2018, 18:23:17 UTC
[3.6] closes bpo-30117: fix lib2to3 ParserIdempotency test (GH-1242) (GH-5443)
[3.6] closes bpo-30117: fix lib2to3 ParserIdempotency test (GH-1242) (GH-5443)
Tip revision: a23a2c5
File | Mode | Size |
---|---|---|
.github | ||
Doc | ||
Grammar | ||
Include | ||
Lib | ||
Mac | ||
Misc | ||
Modules | ||
Objects | ||
PC | ||
PCbuild | ||
Parser | ||
Programs | ||
Python | ||
Tools | ||
.bzrignore | -rw-r--r-- | 582 bytes |
.gitattributes | -rw-r--r-- | 798 bytes |
.gitignore | -rw-r--r-- | 1.3 KB |
.hgeol | -rw-r--r-- | 1.0 KB |
.hgignore | -rw-r--r-- | 1.3 KB |
.hgtags | -rw-r--r-- | 8.7 KB |
.travis.yml | -rw-r--r-- | 5.0 KB |
LICENSE | -rw-r--r-- | 12.5 KB |
Makefile.pre.in | -rw-r--r-- | 59.7 KB |
README.rst | -rw-r--r-- | 9.1 KB |
aclocal.m4 | -rw-r--r-- | 13.0 KB |
config.guess | -rwxr-xr-x | 43.2 KB |
config.sub | -rwxr-xr-x | 35.7 KB |
configure | -rwxr-xr-x | 478.4 KB |
configure.ac | -rw-r--r-- | 159.0 KB |
install-sh | -rwxr-xr-x | 7.0 KB |
pyconfig.h.in | -rw-r--r-- | 41.2 KB |
setup.py | -rw-r--r-- | 102.0 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...