drop typed-ast and require python3.8

Author: asottile

astpretty.py

@@ -3,36 +3,19 @@
 import argparse
 import ast
 import contextlib
-import sys
 from typing import Any
 from typing import Generator
 from typing import Sequence
-from typing import TYPE_CHECKING
-from typing import Union
-
-if TYPE_CHECKING:
-    from typed_ast import ast27
-    from typed_ast import ast3
-    ASTType = Union[ast.AST, ast27.AST, ast3.AST]
 
 AST: tuple[type[Any], ...] = (ast.AST,)
 expr_context: tuple[type[Any], ...] = (ast.expr_context,)
-try:  # pragma: no cover (with typed-ast)
-    from typed_ast import ast27
-    from typed_ast import ast3
-except ImportError:  # pragma: no cover (without typed-ast)
-    typed_support = False
-else:  # pragma: no cover (with typed-ast)
-    AST += (ast27.AST, ast3.AST)
-    expr_context += (ast27.expr_context, ast3.expr_context)
-    typed_support = True
 
 
 def _is_sub_node(node: object) -> bool:
     return isinstance(node, AST) and not isinstance(node, expr_context)
 
 
-def _is_leaf(node: ASTType) -> bool:
+def _is_leaf(node: ast.AST) -> bool:
     for field in node._fields:
         attr = getattr(node, field)
         if _is_sub_node(attr):
@@ -45,14 +28,14 @@ def _is_leaf(node: ASTType) -> bool:
         return True
 
 
-def _fields(n: ASTType, show_offsets: bool = True) -> tuple[str, ...]:
+def _fields(n: ast.AST, show_offsets: bool = True) -> tuple[str, ...]:
     if show_offsets:
         return n._attributes + n._fields
     else:
         return n._fields
 
 
-def _leaf(node: ASTType, show_offsets: bool = True) -> str:
+def _leaf(node: ast.AST, show_offsets: bool = True) -> str:
     if isinstance(node, AST):
         return '{}({})'.format(
             type(node).__name__,
@@ -73,7 +56,7 @@ def _leaf(node: ASTType, show_offsets: bool = True) -> str:
 
 
 def pformat(
-        node: ASTType | None | str,
+        node: ast.AST | None | str,
         indent: str | int = '    ',
         show_offsets: bool = True,
         _indent: int = 0,
@@ -102,7 +85,7 @@ def indented() -> Generator[None, None, None]:
         def indentstr() -> str:
             return state.indent * indent_s
 
-        def _pformat(el: ASTType | None | str, _indent: int = 0) -> str:
+        def _pformat(el: ast.AST | None | str, _indent: int = 0) -> str:
             return pformat(
                 el, indent=indent, show_offsets=show_offsets,
                 _indent=_indent,
@@ -149,34 +132,13 @@ def main(argv: Sequence[str] | None = None) -> int:
         '--no-show-offsets', dest='show_offsets',
         action='store_false',
     )
-    grp = parser.add_mutually_exclusive_group()
-    grp.add_argument(
-        '--untyped', default=ast.parse,
-        dest='parse_func', action='store_const', const=ast.parse,
-        help='(default) Use the stdlib `ast` parser.',
-    )
-    if typed_support:  # pragma: no cover (requires typed-ast)
-        grp.add_argument(
-            '--typed-27',
-            dest='parse_func', action='store_const', const=ast27.parse,
-            help='Use typed_ast.ast27 to parse the ast.',
-        )
-        grp.add_argument(
-            '--typed-3',
-            dest='parse_func', action='store_const', const=ast3.parse,
-            help='Use typed_ast.ast3 to parse the ast.',
-        )
     args = parser.parse_args(argv)
 
-    type_comments = args.parse_func is ast.parse and sys.version_info >= (3, 8)
-    if type_comments:  # pragma: >=3.8 cover
-        kwargs = {'type_comments': True}
-    else:  # pragma: <3.8 cover
-        kwargs = {}
-
     with open(args.filename, 'rb') as f:
         contents = f.read()
-    pprint(args.parse_func(contents, **kwargs), show_offsets=args.show_offsets)
+
+    tree = ast.parse(contents, filename=args.filename, type_comments=True)
+    pprint(tree, show_offsets=args.show_offsets)
     return 0
 
 

azure-pipelines.yml

@@ -10,10 +10,10 @@ resources:
       type: github
       endpoint: github
       name: asottile/azure-pipeline-templates
-      ref: refs/tags/v2.4.0
+      ref: refs/tags/v2.4.1
 
 jobs:
 - template: job--python-tox.yml@asottile
   parameters:
-    toxenvs: [py37, py38, py39]
+    toxenvs: [py38, py39, py310]
     os: linux

requirements-dev.txt

@@ -1,4 +1,3 @@
 covdefaults>=2.1
 coverage
 pytest
-typed-ast;implementation_name=="cpython"

setup.cfg

@@ -13,7 +13,6 @@ classifiers =
     License :: OSI Approved :: MIT License
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
@@ -22,16 +21,12 @@ classifiers =
 
 [options]
 py_modules = astpretty
-python_requires = >=3.7
+python_requires = >=3.8
 
 [options.entry_points]
 console_scripts =
     astpretty = astpretty:main
 
-[options.extras_require]
-typed =
-    typed-ast
-
 [bdist_wheel]
 universal = True
 

tests/astpretty_test.py

@@ -53,7 +53,7 @@ def test_pformat_node():
 
 
 def test_pformat_nested_with_offsets():
-    expected_38 = (
+    expected = (
         'Assign(\n'
         '    lineno=1,\n'
         '    col_offset=0,\n'
@@ -64,15 +64,6 @@ def test_pformat_nested_with_offsets():
         '    type_comment=None,\n'
         ')'
     )
-    expected_lt38 = (
-        'Assign(\n'
-        '    lineno=1,\n'
-        '    col_offset=0,\n'
-        "    targets=[Name(lineno=1, col_offset=0, id='x', ctx=Store())],\n"
-        '    value=Num(lineno=1, col_offset=4, n=5),\n'
-        ')'
-    )
-    expected = expected_38 if sys.version_info >= (3, 8) else expected_lt38
     ret = astpretty.pformat(_to_module_body('x = 5'))
     assert ret == expected
 
@@ -169,22 +160,7 @@ def test_pformat_nested_node_without_line_information():
         '    ctx=Load(),\n'
         ')'
     )
-    expected_lt38 = (
-        'Subscript(\n'
-        '    lineno=1,\n'
-        '    col_offset=0,\n'
-        "    value=Name(lineno=1, col_offset=0, id='a', ctx=Load()),\n"
-        '    slice=Index(\n'
-        '        value=Num(lineno=1, col_offset=2, n=0),\n'
-        '    ),\n'
-        '    ctx=Load(),\n'
-        ')'
-    )
-    expected = (
-        expected_39 if sys.version_info >= (3, 9) else
-        expected_38 if sys.version_info >= (3, 8) else
-        expected_lt38
-    )
+    expected = expected_39 if sys.version_info >= (3, 9) else expected_38
     ret = astpretty.pformat(_to_expr_value('a[0]'))
     assert ret == expected
 
@@ -201,7 +177,7 @@ def test_pprint(capsys):
 
 
 def test_main_with_offsets(capsys, tmpdir):
-    expected_38 = '''\
+    expected = '''\
 Module(
     body=[
         Assign(
@@ -217,19 +193,6 @@ def test_main_with_offsets(capsys, tmpdir):
     type_ignores=[],
 )
 '''  # noqa: E501
-    expected_lt38 = '''\
-Module(
-    body=[
-        Assign(
-            lineno=1,
-            col_offset=0,
-            targets=[Name(lineno=1, col_offset=0, id='x', ctx=Store())],
-            value=Name(lineno=1, col_offset=4, id='y', ctx=Load()),
-        ),
-    ],
-)
-'''
-    expected = expected_38 if sys.version_info >= (3, 8) else expected_lt38
     f = tmpdir.join('test.py')
     f.write('x = y\n')
     astpretty.main((f.strpath,))
@@ -238,7 +201,7 @@ def test_main_with_offsets(capsys, tmpdir):
 
 
 def test_main_hide_offsets(capsys, tmpdir):
-    expected_38 = '''\
+    expected = '''\
 Module(
     body=[
         Assign(
@@ -250,29 +213,13 @@ def test_main_hide_offsets(capsys, tmpdir):
     type_ignores=[],
 )
 '''
-    expected_lt38 = '''\
-Module(
-    body=[
-        Assign(
-            targets=[Name(id='x', ctx=Store())],
-            value=Name(id='y', ctx=Load()),
-        ),
-    ],
-)
-'''
-    expected = expected_38 if sys.version_info >= (3, 8) else expected_lt38
     f = tmpdir.join('test.py')
     f.write('x = y\n')
     astpretty.main((f.strpath, '--no-show-offsets'))
     out, _ = capsys.readouterr()
     assert out == expected
 
 
-def test_typedast_support():
-    typed = not hasattr(sys, 'pypy_version_info')
-    assert typed == astpretty.typed_support
-
-
 TYPED_SRC = 'x = 5  # type: int\nx = "foo"  # type: ignore\n'
 TYPED27_OUT = '''\
 Module(
@@ -354,43 +301,6 @@ def f(
 '''
 
 
-@pytest.mark.xfail(not astpretty.typed_support, reason='needs typed-ast')
-def test_typedast_support_27():
-    expected = TYPED27_OUT.rstrip()
-    assert astpretty.pformat(astpretty.ast27.parse(TYPED_SRC)) == expected
-
-
-@pytest.mark.xfail(not astpretty.typed_support, reason='needs typed-ast')
-def test_typedast_support_3():
-    expected = TYPED3_OUT.rstrip()
-    assert astpretty.pformat(astpretty.ast3.parse(TYPED_SRC)) == expected
-
-
-@pytest.mark.xfail(not astpretty.typed_support, reason='needs typed-ast')
-def test_typedast_ast27_arguments():
-    expected = FUNC_SRC_TYPED27_OUT.strip()
-    assert astpretty.pformat(astpretty.ast27.parse(FUNC_SRC)) == expected
-
-
-@pytest.mark.xfail(not astpretty.typed_support, reason='needs typed-ast')
-def test_typedast_support_cmdline_27(tmpdir, capsys):  # pragma: no cover
-    f = tmpdir.join('f.py')
-    f.write(TYPED_SRC)
-    assert not astpretty.main((str(f), '--typed-27'))
-    out, _ = capsys.readouterr()
-    assert out == TYPED27_OUT
-
-
-@pytest.mark.xfail(not astpretty.typed_support, reason='needs typed-ast')
-def test_typedast_support_cmdline_3(tmpdir, capsys):  # pragma: no cover
-    f = tmpdir.join('f.py')
-    f.write(TYPED_SRC)
-    assert not astpretty.main((str(f), '--typed-3'))
-    out, _ = capsys.readouterr()
-    assert out == TYPED3_OUT
-
-
-@pytest.mark.xfail(sys.version_info < (3, 8), reason='py38+ syntax only')
 def test_pformat_py38_type_comments(tmpdir, capsys):
     expected = '''\
 Module(

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,pypy3,pre-commit
+envlist = py38,pypy3,pre-commit
 
 [testenv]
 deps = -rrequirements-dev.txt