]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / vim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 959ff79)
Remove nonsensical grammar from blib2to3
authorŁukasz Langa <lukasz@langa.pl>
Mon, 23 Apr 2018 21:24:14 +0000 (14:24 -0700)
committerŁukasz Langa <lukasz@langa.pl>
Mon, 23 Apr 2018 21:24:14 +0000 (14:24 -0700)
black.py patch | blob | history
blib2to3/pygram.py patch | blob | history

diff --git a/black.py b/black.py
index eafc9e7be9251abaaee8fbef9b024e243b02a15c..da645a1fad535382255cbd0801acd89991d4c601 100644 (file)
--- a/black.py
+++ b/black.py
@@ -428,7 +428,6 @@ def format_str(src_contents: str, line_length: int) -> FileContent:
 GRAMMARS = [
     pygram.python_grammar_no_print_statement_no_exec_statement,
     pygram.python_grammar_no_print_statement,
 GRAMMARS = [
     pygram.python_grammar_no_print_statement_no_exec_statement,
     pygram.python_grammar_no_print_statement,
-    pygram.python_grammar_no_exec_statement,
     pygram.python_grammar,
 ]
 
     pygram.python_grammar,
 ]
 
diff --git a/blib2to3/pygram.py b/blib2to3/pygram.py
index bf55ab4babc1f29500fd1880c65702b95207ce70..b847c1e71b7d2261cdc4b4cf2e4f94070c503938 100644 (file)
--- a/blib2to3/pygram.py
+++ b/blib2to3/pygram.py
@@ -29,16 +29,16 @@ class Symbols(object):
             setattr(self, name, symbol)
 
 
             setattr(self, name, symbol)
 
 
+# Python 2
 python_grammar = driver.load_packaged_grammar("blib2to3", _GRAMMAR_FILE)
 
 python_symbols = Symbols(python_grammar)
 
 python_grammar = driver.load_packaged_grammar("blib2to3", _GRAMMAR_FILE)
 
 python_symbols = Symbols(python_grammar)
 
+# Python 2 + from __future__ import print_function
 python_grammar_no_print_statement = python_grammar.copy()
 del python_grammar_no_print_statement.keywords["print"]
 
 python_grammar_no_print_statement = python_grammar.copy()
 del python_grammar_no_print_statement.keywords["print"]
 
-python_grammar_no_exec_statement = python_grammar.copy()
-del python_grammar_no_exec_statement.keywords["exec"]
-
+# Python 3
 python_grammar_no_print_statement_no_exec_statement = python_grammar.copy()
 del python_grammar_no_print_statement_no_exec_statement.keywords["print"]
 del python_grammar_no_print_statement_no_exec_statement.keywords["exec"]
 python_grammar_no_print_statement_no_exec_statement = python_grammar.copy()
 del python_grammar_no_print_statement_no_exec_statement.keywords["print"]
 del python_grammar_no_print_statement_no_exec_statement.keywords["exec"]
vim configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.