Wrap multiple context managers in parentheses when targeting Python 3.9+ (#3489)

[etc/vim.git] / src / black / parsing.py

diff --git a/src/black/parsing.py b/src/black/parsing.py
index d1ad7d2c671a605d5a8745f39f47de355ae22cae..c37c12b868d7f5e75e73e6f036ea7d7d5bae3604 100644 (file)
--- a/src/black/parsing.py
+++ b/src/black/parsing.py
@@ -11,16 +11,14 @@ if sys.version_info < (3, 8):
 else:
     from typing import Final
 
 else:
     from typing import Final
 

-# lib2to3 fork
-from blib2to3.pytree import Node, Leaf
+from black.mode import Feature, TargetVersion, supports_feature
+from black.nodes import syms

 from blib2to3 import pygram
 from blib2to3.pgen2 import driver
 from blib2to3.pgen2.grammar import Grammar
 from blib2to3.pgen2.parse import ParseError
 from blib2to3.pgen2.tokenize import TokenError
 from blib2to3 import pygram
 from blib2to3.pgen2 import driver
 from blib2to3.pgen2.grammar import Grammar
 from blib2to3.pgen2.parse import ParseError
 from blib2to3.pgen2.tokenize import TokenError

-
-from black.mode import TargetVersion, Feature, supports_feature
-from black.nodes import syms
+from blib2to3.pytree import Leaf, Node

 
 ast3: Any
 
 
 ast3: Any
 


@@ -29,12 +27,13 @@ _IS_PYPY = platform.python_implementation() == "PyPy"
 try:
     from typed_ast import ast3
 except ImportError:
 try:
     from typed_ast import ast3
 except ImportError:

-    # Either our python version is too low, or we're on pypy
-    if sys.version_info < (3, 7) or (sys.version_info < (3, 8) and not _IS_PYPY):
+    if sys.version_info < (3, 8) and not _IS_PYPY:

         print(
         print(

-            "The typed_ast package is required but not installed.\n"
-            "You can upgrade to Python 3.8+ or install typed_ast with\n"
-            "`python3 -m pip install typed-ast`.",
+            (
+                "The typed_ast package is required but not installed.\n"
+                "You can upgrade to Python 3.8+ or install typed_ast with\n"
+                "`python3 -m pip install typed-ast`."
+            ),

             file=sys.stderr,
         )
         sys.exit(1)
             file=sys.stderr,
         )
         sys.exit(1)


@@ -168,8 +167,6 @@ def parse_single_version(
         # comments separately.
         return ast3.parse(src, filename, feature_version=version[1])
 
         # comments separately.
         return ast3.parse(src, filename, feature_version=version[1])
 

-    raise AssertionError("INTERNAL ERROR: Tried parsing unsupported Python version!")
-

 
 def parse_ast(src: str) -> Union[ast.AST, ast3.AST]:
     # TODO: support Python 4+ ;)
 
 def parse_ast(src: str) -> Union[ast.AST, ast3.AST]:
     # TODO: support Python 4+ ;)