eb126eddbd
[3.6] compare with difflib not diff(1) (GH-5450) (GH-5453)
...
Co-authored-by: Benjamin Peterson <benjamin@python.org>
2018-01-30 11:31:10 -08:00
a23a2c555c
[3.6] closes bpo-30117: fix lib2to3 ParserIdempotency test (GH-1242) (GH-5443)
...
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 14e976e00e
2018-01-30 10:23:17 -08:00
1b2812a7b4
remove unused import (GH-5040) ( #5042 )
...
(cherry picked from commit e325608740
2017-12-28 23:48:10 -08:00
85f71aa9d6
make PatternCompiler use the packaged grammar if possible (more bpo-24960) (GH-5034) ( #5036 )
...
(cherry picked from commit e5f7dccefa
2017-12-28 18:12:41 -08:00
6ba0637727
correct wording (GH-4983) ( #4984 )
...
(cherry picked from commit d11e8e0d11
2017-12-22 21:49:35 -08:00
c1b8eb8006
bpo-24960: use pkgutil.get_data in lib2to3 to read pickled grammar files (GH-4977) ( #4979 )
...
This is more complicated than it should be because we need to preserve the
useful mtime-based regeneration feature that lib2to3.pgen2.driver.load_grammar
has. We only look for the pickled grammar file with pkgutil.get_data and only if
the source file does not exist.
(cherry picked from commit 8a5877165e
2017-12-22 12:51:46 -08:00
292b421d48
bpo-28837: Fix lib2to3 handling of map/zip/filter calls when followed with a 'trailer', e.g. zip()[x] (GH-24) (GH-2235)
...
(cherry picked from commit 93b4b47e3a
2017-06-15 19:56:52 -07:00
e8412e684e
[3.6] bpo-23894: make lib2to3 recognize f-strings (GH-1733) ( #1737 )
...
Note: this doesn't unpack f-strings into the underlying JoinedStr AST.
Ideally we'd fully implement JoinedStr here but given its additional
complexity, I think this is worth bandaiding as is. This unblocks tools like
https://github.com/google/yapf to format 3.6 syntax using f-strings.
(cherry picked from commit 1b9530c536
2017-05-22 22:23:29 -07:00
1398b1bc7d
[3.6] Make rb'' strings work in lib2to3 (GH-1724) ( #1730 )
...
This partially solves bpo-23894.
(cherry picked from commit 0c4aca54dc
2017-05-22 16:35:15 -07:00
2cdf087d1f
[3.6] bpo-29869: Allow underscores in numeric literals in lib2to3. (GH-1119) (GH-1122)
...
* Allow underscores in numeric literals in lib2to3.
* Stricter literal parsing for Python 3.6 in lib2to3.pgen2.tokenize.
* Add test case for underscores in literals in Python 3.
(cherry picked from commit a6e395dffa
2017-04-13 16:54:49 -07:00
84c2d75489
Revert "bpo-29869: Allow underscores in numeric literals in lib2to3. (GH-752)" (GH-1109)
...
This reverts commit 97a40b7a5b
2017-04-13 04:03:16 -07:00
97a40b7a5b
bpo-29869: Allow underscores in numeric literals in lib2to3. (GH-752)
2017-04-13 03:21:05 -07:00
3d3e9ffa8e
merge 3.5
2016-12-05 22:31:12 -08:00
41fef63076
rm unused import
2016-12-05 22:30:55 -08:00
fd1df3fef2
Issue #28394 : Merge typo fixes from 3.5 into 3.6
2016-10-10 00:28:38 +00:00
d2a584b47b
Issue #28394 : Spelling and typo fixes in code comments and changelog
...
Includes patch by Ville Skyttä.
2016-10-10 00:24:34 +00:00
fc3f7d5677
Remove the debug print that i accidentally left in.
2016-09-10 20:39:50 -07:00
3a95f45a38
Remove the debug print that i accidentally left in.
2016-09-10 20:39:36 -07:00
28325749c0
Issue #25969 : Update the lib2to3 grammar to handle the unpacking
...
generalizations added in 3.5.
2016-09-09 18:18:52 -07:00
dbdf029a55
remove fix_callable - callable() was readded many releases ago.
2016-09-09 18:14:33 -07:00
3b822d6c89
Issue #25969 : Update the lib2to3 grammar to handle the unpacking
...
generalizations added in 3.5.
2016-09-09 18:19:51 -07:00
223f12c9eb
Remove 2to3's fix_callable... We reintroduced the callable built-in
...
pretty early on in the 3.x series (3.1 or 3.2?).
2016-09-09 17:03:58 -07:00
fa40ca811f
issue27985 - fix the incorrect duplicate class name in the lib2to3
...
test. call it TestVarAnnotations instead.
2016-09-09 14:48:08 -07:00
52c4e7cc84
Issue #28008 : Implement PEP 530 -- asynchronous comprehensions.
2016-09-09 10:36:01 -07:00
f8cb8a16a3
Issue #27985 : Implement PEP 526 -- Syntax for Variable Annotations.
...
Patch by Ivan Levkivskyi.
2016-09-08 20:50:03 -07:00
9719161858
Fix indentation (reindent.py).
2016-09-08 00:48:07 +00:00
dd1c638b92
lib2to3.pgen3.driver.load_grammar() now creates a stable cache file
...
between runs given the same Grammar.txt input regardless of the hash
randomization setting.
2016-09-08 00:40:07 +00:00
a68c1bca7b
Remove legacy "from __future__ import with_statement" lines.
2016-09-08 13:47:41 -07:00
627b7556e8
Fix indentation (reindent.py).
2016-09-08 00:48:22 +00:00
0c578d62fc
lib2to3.pgen3.driver.load_grammar() now creates a stable cache file
...
between runs given the same Grammar.txt input regardless of the hash
randomization setting.
2016-09-08 00:46:26 +00:00
64204de04c
Issue #27095 : Simplified MAKE_FUNCTION and removed MAKE_CLOSURE opcodes.
...
Patch by Demur Rumed.
2016-06-12 17:36:24 +03:00
50d4c15ba7
Issue #27030 : Merge RE fix from 3.5
2016-06-12 06:08:29 +00:00
d4704803b9
Fix buggy RE “\parrot_example.py”, uncovered by Issue #27030
2016-06-12 06:07:35 +00:00
3e04d5b306
Issue #27076 : Merge spelling from 3.5
2016-05-26 06:03:19 +00:00
46f50726a0
Issue #27076 : Doc, comment and tests spelling fixes
...
Most fixes to Doc/ and Lib/ directories by Ville Skyttä.
2016-05-26 05:35:26 +00:00
cc20d63e64
Merge with 3.5
2016-05-06 15:58:13 -04:00
823c626b43
Issue 26911: fix import (other problems remain).
2016-05-06 15:57:57 -04:00
ccd047ea4b
Removed unused imports.
2016-04-25 00:12:32 +03:00
a6f26c1d34
Remove more unused imports in tests.
2016-04-25 00:05:30 +03:00
e437a10d15
Issue #23277 : Remove unused imports in tests.
2016-04-24 21:41:02 +03:00
c7f44aa99a
Issue #23277 : Remove more unused sys and os imports.
2016-04-24 13:25:01 +03:00
b6a9c9761c
Issue #26778 : Fixed "a/an/and" typos in code comment, documentation and error
...
messages.
2016-04-17 09:39:28 +03:00
6a7b3a77b4
Issue #26778 : Fixed "a/an/and" typos in code comment and documentation.
2016-04-17 08:32:47 +03:00
a051bf3afb
Issue #26581 : Use the first coding cookie on a line, not the last one.
2016-03-20 23:47:48 +02:00
e431d3c9aa
Issue #26581 : Use the first coding cookie on a line, not the last one.
2016-03-20 23:36:29 +02:00
4a7c03aab4
Issue #25523 : Merge a-to-an corrections from 3.5.
2015-11-02 14:44:29 +02:00
a84f6c3dd3
Issue #25523 : Merge a-to-an corrections from 3.4.
2015-11-02 14:39:05 +02:00
d65c9496da
Issue #25523 : Further a-to-an corrections.
2015-11-02 14:10:23 +02:00
e56a919100
Issue #25523 : Merge a-to-an corrections from 3.5
2015-11-02 04:27:17 +00:00
2eb819f7a8
Issue #25523 : Merge "a" to "an" fixes from 3.4 into 3.5
2015-11-02 04:04:57 +00:00
Benjamin Peterson
Miss Islington (bot)
Mariatta
Łukasz Langa
Nevada Sanchez
Martin Panter
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)
Yury Selivanov
Serhiy Storchaka
Terry Jan Reedy