pyflyby 1.8.6__tar.gz → 1.8.7__tar.gz

{pyflyby-1.8.6/lib/python/pyflyby.egg-info → pyflyby-1.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyflyby
-Version: 1.8.6
+Version: 1.8.7
 Summary: pyflyby - Python development productivity tools, in particular automatic import management
 Home-page: https://pypi.org/project/pyflyby/
 Author: Karl Chen
@@ -257,7 +257,7 @@ Compatibility
 -------------
 
 Tested with:
-  - Python 3.7, 3.8, 3.9, 3.10
+  - Python 3.8, 3.9, 3.10
   - IPython 0.10, 0.11, 0.12, 0.13, 1.0, 1.2, 2.0, 2.1, 2.2, 2.3, 2.4, 3.0,
     3.1, 3.2, 4.0., 7.11 (latest)
   - IPython (text console), IPython Notebook, Spyder

{pyflyby-1.8.6 → pyflyby-1.8.7}/README.rst

@@ -236,7 +236,7 @@ Compatibility
 -------------
 
 Tested with:
-  - Python 3.7, 3.8, 3.9, 3.10
+  - Python 3.8, 3.9, 3.10
   - IPython 0.10, 0.11, 0.12, 0.13, 1.0, 1.2, 2.0, 2.1, 2.2, 2.3, 2.4, 3.0,
     3.1, 3.2, 4.0., 7.11 (latest)
   - IPython (text console), IPython Notebook, Spyder

{pyflyby-1.8.6 → pyflyby-1.8.7}/bin/pyflyby/_autoimp.py

@@ -609,17 +609,13 @@ class _MissingImportFinder(object):
         #     scope.
         #   - Store the name in the current scope (but not visibly to
         #     args/decorator_list).
-        if sys.version_info >= (3, 8):
-            assert node._fields == ('name', 'args', 'body', 'decorator_list', 'returns', 'type_comment'), node._fields
-        else:
-            assert node._fields == ('name', 'args', 'body', 'decorator_list', 'returns'), node._fields
+        assert node._fields == ('name', 'args', 'body', 'decorator_list', 'returns', 'type_comment'), node._fields
         with self._NewScopeCtx(include_class_scopes=True):
             self.visit(node.args)
             self.visit(node.decorator_list)
             if node.returns:
                 self.visit(node.returns)
-            if sys.version_info >= (3, 8):
-                self._visit_typecomment(node.type_comment)
+            self._visit_typecomment(node.type_comment)
             old_in_FunctionDef = self._in_FunctionDef
             self._in_FunctionDef = True
             with self._NewScopeCtx(unhide_classdef=True):
@@ -671,10 +667,7 @@ class _MissingImportFinder(object):
         self.visit(node)
 
     def visit_arguments(self, node):
-        if sys.version_info >= (3, 8):
-            assert node._fields == ('posonlyargs', 'args', 'vararg', 'kwonlyargs', 'kw_defaults', 'kwarg', 'defaults'), node._fields
-        else:
-            assert node._fields == ('args', 'vararg', 'kwonlyargs', 'kw_defaults', 'kwarg', 'defaults'), node._fields
+        assert node._fields == ('posonlyargs', 'args', 'vararg', 'kwonlyargs', 'kw_defaults', 'kwarg', 'defaults'), node._fields
         # Argument/parameter list.  Note that the defaults should be
         # considered "Load"s from the upper scope, and the argument names are
         # "Store"s in the function scope.
@@ -693,8 +686,7 @@ class _MissingImportFinder(object):
         # Store arg names.
         self.visit(node.args)
         self.visit(node.kwonlyargs)
-        if sys.version_info >= (3, 8):
-            self.visit(node.posonlyargs)
+        self.visit(node.posonlyargs)
         # may be None.
         if node.vararg:
             self.visit(node.vararg)
@@ -807,16 +799,12 @@ class _MissingImportFinder(object):
         self._visit_fullname(node.id, node.ctx)
 
     def visit_arg(self, node):
-        if sys.version_info >= (3, 8):
-            assert node._fields == ('arg', 'annotation', 'type_comment'), node._fields
-        else:
-            assert node._fields == ('arg', 'annotation'), node._fields
+        assert node._fields == ('arg', 'annotation', 'type_comment'), node._fields
         if node.annotation:
             self.visit(node.annotation)
         # Treat it like a Name node would from Python 2
         self._visit_fullname(node.arg, ast.Param())
-        if sys.version_info >= (3, 8):
-            self._visit_typecomment(node.type_comment)
+        self._visit_typecomment(node.type_comment)
 
     def visit_Attribute(self, node):
         name_revparts = []
@@ -1512,8 +1500,7 @@ def find_missing_imports(arg, namespaces):
             else:
                 return []
         # Parse the string into an AST.
-        kw = {} if sys.version_info < (3, 8) else {'type_comments': True}
-        node = ast.parse(arg, **kw) # may raise SyntaxError
+        node = ast.parse(arg, type_comments=True) # may raise SyntaxError
         # Get missing imports from AST.
         return _find_missing_imports_in_ast(node, namespaces)
     elif isinstance(arg, PythonBlock):

{pyflyby-1.8.6 → pyflyby-1.8.7}/bin/pyflyby/_comms.py

@@ -121,24 +121,23 @@ def _reformat_helper(input_code, imports):
 
 def extract_import_statements(text):
     """This is a util for notebook interactions and extracts import statements
-    from some python code.
-
+    from some python code. This function also re-orders imports.
     Args:
         code (str): The code from which import statements have to be extracted
 
     Returns:
-        (list[str], str): The first returned value is a list of all import
-        statements. The second returned value is the remaining code after
+        (str, str): The first returned value contains all the import statements.
+        The second returned value is the remaining code after
         extracting the import statements.
     """
     transformer = SourceToSourceFileImportsTransformation(text)
-    imports = [str(im.pretty_print()) for im in transformer.import_blocks]
+    imports = '\n'.join([str(im.pretty_print()) for im in transformer.import_blocks])
     remaining_code = "\n".join([str(st.pretty_print()) if not isinstance(st, SourceToSourceImportBlockTransformation) else "" for st in transformer.blocks])
     return imports, remaining_code
 
-def collect_code_with_imports_on_top(imports, cell_array):
-   return (
-        "\n".join(imports)
+def collect_code_with_imports_on_top(imports: str, cell_array):
+    return (
+        imports
         + "\n"
         + "\n".join(
             [
@@ -185,7 +184,13 @@ def comm_open_handler(comm, message):
         elif data["type"] == TIDY_IMPORTS:
             checksum = data.get("checksum", '')
             cell_array = data.get("cellArray", [])
-            import_statements, processed_cell_array = [], []
+            # import_statements is a string because when
+            # SourceToSourceFileImportsTransformation is run on a piece of code
+            # it will club similar imports together and re-order the imports
+            # by making the imports a string, all the imports are processed
+            # together making sure tidy-imports has context on all the imports
+            # while clubbing similar imports and re-ordering them.
+            import_statements, processed_cell_array = "", []
             for cell in cell_array:
                 text = cell.get("text")
                 cell_type = cell.get("type")
@@ -201,6 +206,6 @@ def comm_open_handler(comm, message):
                     "checksum": checksum,
                     "type": TIDY_IMPORTS,
                     "cells": processed_cell_array,
-                    "imports": [im.strip() for im in import_statements],
+                    "imports": import_statements,
                 }
             )

{pyflyby-1.8.6 → pyflyby-1.8.7}/bin/pyflyby/_imports2s.py

@@ -1,9 +1,9 @@
 # pyflyby/_imports2s.py.
 # Copyright (C) 2011-2018 Karl Chen.
 # License: MIT http://opensource.org/licenses/MIT
+from collections import defaultdict
 
-
-
+import isort
 from   pyflyby._autoimp         import scan_for_import_issues
 from   pyflyby._file            import FileText, Filename
 from   pyflyby._flags           import CompilerFlags
@@ -534,6 +534,48 @@ def replace_star_imports(codeblock, params=None):
     return transformer.output(params=params)
 
 
+def sort_imports(codeblock):
+    """
+    Sort imports for better grouping.
+    :param codeblock:
+    :return: codeblock
+    """
+    sorted_imports = isort.code(
+        str(codeblock),
+        # To sort all the import in lexicographic order
+        force_sort_within_sections=True,
+        # This is done below
+        lines_between_sections=0,
+        lines_after_imports=1
+    )
+    # Step 1: Split the input string into a list of lines
+    lines = sorted_imports.split('\n')
+
+    # Step 2: Identify groups of imports and keep track of their line numbers
+    pkg_lines = defaultdict(list)
+    line_pkg_dict = {}
+    for i, line in enumerate(lines):
+        match = re.match(r'(from (\w+)|import (\w+))', line)
+        if match:
+            current_pkg = match.groups()[1:3]
+            current_pkg = current_pkg[0] if current_pkg[0] is not None else current_pkg[1]
+            pkg_lines[current_pkg].append(i)
+            line_pkg_dict[i] = current_pkg
+
+    # Step 3: Create the output list of lines with blank lines around groups with more than one import
+    output_lines = []
+    for i, line in enumerate(lines):
+        if i > 0 and line_pkg_dict.get(i) != line_pkg_dict.get(i-1) and len(pkg_lines[line_pkg_dict.get(i)]) > 1:
+            output_lines.append('')
+        output_lines.append(line)
+        if i < len(lines) - 1 and line_pkg_dict.get(i) != line_pkg_dict.get(i+1) and len(pkg_lines[line_pkg_dict.get(i)]) > 1:
+            output_lines.append('')
+
+    # Step 4: Join the lines to create the output string
+    sorted_output_str = '\n'.join(output_lines)
+    return PythonBlock(sorted_output_str)
+
+
 def transform_imports(codeblock, transformations, params=None):
     """
     Transform imports as specified by ``transformations``.

{pyflyby-1.8.6/lib/python → pyflyby-1.8.7/bin}/pyflyby/_parse.py

@@ -24,19 +24,7 @@ from   pyflyby._util            import cached_attribute, cmp
 
 from ast import Bytes
 
-if sys.version_info >= (3, 8):
-    from ast import TypeIgnore, AsyncFunctionDef
-else:
-
-    # TypeIgnore, AsyncFunctionDef does not exist on Python 3.7 and before. thus
-    # we define a dummy TypeIgnore, AsyncFunctionDef just to simplify remaining
-    # code.
-
-    class TypeIgnore:
-        pass
-
-    class AsyncFunctionDef:
-        pass
+from ast import TypeIgnore, AsyncFunctionDef
 
 
 def _is_comment_or_blank(line):
@@ -104,37 +92,27 @@ def _iter_child_nodes_in_order_internal_1(node):
         assert node._fields == ("keys", "values")
         yield list(zip(node.keys, node.values))
     elif isinstance(node, (ast.FunctionDef, AsyncFunctionDef)):
-        if sys.version_info >= (3, 8):
-            assert node._fields == (
-                "name",
-                "args",
-                "body",
-                "decorator_list",
-                "returns",
-                "type_comment",
-            ), node._fields
-            res = (
-                node.type_comment,
-                node.decorator_list,
-                node.args,
-                node.returns,
-                node.body,
-            )
-            yield res
-        else:
-            assert node._fields == ('name', 'args', 'body', 'decorator_list',
-                                    'returns'), node._fields
-            yield node.decorator_list, node.args, node.returns, node.body
+        assert node._fields == (
+            "name",
+            "args",
+            "body",
+            "decorator_list",
+            "returns",
+            "type_comment",
+        ), node._fields
+        res = (
+            node.type_comment,
+            node.decorator_list,
+            node.args,
+            node.returns,
+            node.body,
+        )
+        yield res
         # node.name is a string, not an AST node
     elif isinstance(node, ast.arguments):
-        if sys.version_info >= (3, 8):
-            assert node._fields == ('posonlyargs', 'args', 'vararg', 'kwonlyargs',
-                                    'kw_defaults', 'kwarg', 'defaults'), node._fields
-            args = node.posonlyargs + node.args
-        else:
-            assert node._fields == ('args', 'vararg', 'kwonlyargs',
-                                    'kw_defaults', 'kwarg', 'defaults'), node._fields
-            args = node.args
+        assert node._fields == ('posonlyargs', 'args', 'vararg', 'kwonlyargs',
+                                'kw_defaults', 'kwarg', 'defaults'), node._fields
+        args = node.posonlyargs + node.args
         defaults = node.defaults or ()
         num_no_default = len(args) - len(defaults)
         yield args[:num_no_default]
@@ -187,22 +165,10 @@ def _flags_to_try(source, flags, auto_flags, mode):
     If ``auto_flags`` is True, then yield ``flags`` and ``flags ^ print_function``.
     """
     flags = CompilerFlags(flags)
-    if sys.version_info >= (3, 8):
-        if re.search(r"# *type:", source):
-            flags = flags | CompilerFlags('type_comments')
-        yield flags
-        return
-    if not auto_flags:
-        yield flags
-        return
-    if mode == "eval":
-        if re.search(r"\bprint\b", source):
-            flags = flags | CompilerFlags("print_function")
-        yield flags
-        return
+    if re.search(r"# *type:", source):
+        flags = flags | CompilerFlags('type_comments')
     yield flags
-    if re.search(r"\bprint\b", source):
-        yield flags ^ CompilerFlags("print_function")
+    return
 
 
 def _parse_ast_nodes(text, flags, auto_flags, mode):
@@ -348,14 +314,6 @@ def _annotate_ast_startpos(ast_node, parent_ast_node, minpos, text, flags):
     """
     assert isinstance(ast_node, (ast.AST, str, TypeIgnore)), ast_node
 
-    # joined strings and children do not carry a column offset on pre-3.8
-    # this prevent reformatting.
-    # set the column offset to the parent value before 3.8
-    if (3, 7) < sys.version_info < (3, 8):
-        instances = (getattr(ast, "JoinedStr", None), ast.FormattedValue)
-        if ((isinstance(ast_node, instances) or isinstance(parent_ast_node, instances)) and ast_node.col_offset == -1) or isinstance(ast_node, ast.keyword):
-            ast_node.col_offset = parent_ast_node.col_offset
-
     # First, traverse child nodes.  If the first child node (recursively) is a
     # multiline string, then we need to transfer its information to this node.
     # Walk all nodes/fields of the AST.  We implement this as a custom
@@ -400,9 +358,8 @@ def _annotate_ast_startpos(ast_node, parent_ast_node, minpos, text, flags):
     if ast_node.col_offset >= 0:
         # In Python 3.8+, FunctionDef.lineno is the line with the def. To
         # account for decorators, we need the lineno of the first decorator
-        if (sys.version_info >= (3, 8)
-            and isinstance(ast_node, (ast.FunctionDef, ast.ClassDef, AsyncFunctionDef))
-            and ast_node.decorator_list):
+        if (isinstance(ast_node, (ast.FunctionDef, ast.ClassDef, AsyncFunctionDef))
+                and ast_node.decorator_list):
             delta = (ast_node.decorator_list[0].lineno-1,
                      # The col_offset doesn't include the @
                      ast_node.decorator_list[0].col_offset - 1)
@@ -486,9 +443,6 @@ def _annotate_ast_startpos(ast_node, parent_ast_node, minpos, text, flags):
             for _m in re.finditer("[bBrRuU]*[\"\']", start_line)])
     target_str = ast_node.s
 
-    if isinstance(target_str, bytes) and sys.version_info[:2] == (3, 7):
-        target_str = target_str.decode()
-
     # Loop over possible end_linenos.  The first one we've identified is the
     # by far most likely one, but in theory it could be anywhere later in the
     # file.  This could be because of a dastardly concatenated string like
@@ -553,18 +507,8 @@ def _annotate_ast_startpos(ast_node, parent_ast_node, minpos, text, flags):
             candidate_str = _test_parse_string_literal(subtext, flags)
             if candidate_str is None:
                 continue
-            if isinstance(candidate_str, bytes) and sys.version_info[:2] == (3, 7):
-                candidate_str = candidate_str.decode()
 
             maybe_fstring = False
-            try:
-                if (3, 7) <= sys.version_info <= (3, 8):
-                    potential_start = text.lines[startpos.lineno - 1]
-                    maybe_fstring = ("f'" in potential_start) or (
-                        'f"' in potential_start
-                    )
-            except IndexError:
-                pass
 
             if target_str == candidate_str and target_str:
                 # Success!
@@ -589,17 +533,6 @@ def _annotate_ast_startpos(ast_node, parent_ast_node, minpos, text, flags):
             for (sq, sp) in startpos_candidates
             if sp in matched_prefix
         ]
-    if (3, 7) <= sys.version_info <= (3, 8):
-        if len(f_string_candidate_prefixes) == 1:
-            # we did not find the string but there is one fstring candidate starting it
-
-            ast_node.startpos, ast_node.endpos = f_string_candidate_prefixes[0]
-            return True
-        elif isinstance(parent_ast_node, ast.JoinedStr):
-            self_pos = parent_ast_node.values.index(ast_node)
-            ast_node.startpos = parent_ast_node.values[self_pos - 1].startpos
-            ast_node.endpos = parent_ast_node.values[self_pos - 1].endpos
-            return True
     raise ValueError("Couldn't find exact position of %s" % (ast.dump(ast_node)))
 
 

{pyflyby-1.8.6/lib/python → pyflyby-1.8.7/bin}/pyflyby/_py.py

@@ -379,10 +379,7 @@ FLAGS = CompilerFlags(["absolute_import", "with_statement", "division",
 
 
 def _get_argspec(arg, _recurse=False):
-    if sys.version_info[0] == 3:
-        from inspect import getfullargspec as getargspec, FullArgSpec as ArgSpec
-    else:
-        from inspect import getargspec, ArgSpec
+    from inspect import getfullargspec as getargspec, FullArgSpec as ArgSpec
     if isinstance(arg, FunctionType):
         return getargspec(arg)
     elif isinstance(arg, MethodType):
@@ -402,10 +399,7 @@ def _get_argspec(arg, _recurse=False):
         return _get_argspec(arg.__call__, _recurse=False)
     elif callable(arg):
         # Unknown, probably a built-in method.
-        if sys.version_info[0] == 3:
-            return ArgSpec((), "args", "kwargs", None, [], None, {})
-        else:
-            return ArgSpec((), "args", "kwargs", None)
+        return ArgSpec((), "args", "kwargs", None, [], None, {})
     raise TypeError(
         "_get_argspec: unexpected %s" % (type(arg).__name__,))
 
@@ -515,12 +509,11 @@ def _build_function_usage_string(function_name, argspec, prefix):
     if argspec.varargs:
         syntax1 += " %s..." % argspec.varargs
     syntax1 += "]" * len(defaults)
-    if sys.version_info[0] == 3:
-        for arg in argspec.kwonlyargs:
-            if argspec.kwonlydefaults and arg in argspec.kwonlydefaults:
-                syntax1 += " [--%s=...]" % (arg,)
-            else:
-                syntax1 += " --%s=..." % (arg,)
+    for arg in argspec.kwonlyargs:
+        if argspec.kwonlydefaults and arg in argspec.kwonlydefaults:
+            syntax1 += " [--%s=...]" % (arg,)
+        else:
+            syntax1 += " --%s=..." % (arg,)
     if keywords:
         syntax1 += " [--...]"
     usage.append(syntax1)
@@ -531,12 +524,11 @@ def _build_function_usage_string(function_name, argspec, prefix):
             syntax2 += " [--%s=...]" % (arg,)
         else:
             syntax2 += " --%s=..." % (arg,)
-    if sys.version_info[0] == 3:
-        for arg in argspec.kwonlyargs:
-            if argspec.kwonlydefaults and arg in argspec.kwonlydefaults:
-                syntax2 += " [--%s=...]" % (arg,)
-            else:
-                syntax2 += " --%s=..." % (arg,)
+    for arg in argspec.kwonlyargs:
+        if argspec.kwonlydefaults and arg in argspec.kwonlydefaults:
+            syntax2 += " [--%s=...]" % (arg,)
+        else:
+            syntax2 += " --%s=..." % (arg,)
     if argspec.varargs:
         syntax2 += " %s..." % argspec.varargs
     if keywords:
@@ -717,20 +709,18 @@ def _parse_auto_apply_args(argspec, commandline_args, namespace, arg_mode="auto"
     for argname, default in zip(argspec.args[len(argspec.args)-len(defaults):],
                                 defaults):
         argname2default[argname] = make_expr(default, "raw_value")
-    if sys.version_info[0] == 3:
-        if argspec.kwonlydefaults:
-            for argname, default in argspec.kwonlydefaults.items():
-                argname2default[argname] = make_expr(default, "raw_value")
+    if argspec.kwonlydefaults:
+        for argname, default in argspec.kwonlydefaults.items():
+            argname2default[argname] = make_expr(default, "raw_value")
     # Create a map from prefix to arguments with that prefix.  E.g. {"foo":
     # ["foobar", "foobaz"]}
     prefix2argname = {}
     for argname in argspec.args:
         for prefix in prefixes(argname):
             prefix2argname.setdefault(prefix, []).append(argname)
-    if sys.version_info[0] == 3:
-        for argname in argspec.kwonlyargs:
-            for prefix in prefixes(argname):
-                prefix2argname.setdefault(prefix, []).append(argname)
+    for argname in argspec.kwonlyargs:
+        for prefix in prefixes(argname):
+            prefix2argname.setdefault(prefix, []).append(argname)
     # Enumerate over input arguments.
     got_pos_args = []
     got_keyword_args = {}
@@ -769,14 +759,9 @@ def _parse_auto_apply_args(argspec, commandline_args, namespace, arg_mode="auto"
                         raise _ParseInterruptedWantHelp
                     if argname in ["source"]:
                         raise _ParseInterruptedWantSource
-                if sys.version_info[0] == 3:
-                    if not argspec.varkw:
-                        raise ParseError("Unknown option name %s" %
-                                         (argname,))
-                else:
-                    if not argspec.keywords:
-                        raise ParseError("Unknown option name %s" %
-                                         (argname,))
+                if not argspec.varkw:
+                    raise ParseError("Unknown option name %s" %
+                                     (argname,))
 
             elif len(matched_argnames) > 1:
                 raise ParseError(

{pyflyby-1.8.6/lib/python → pyflyby-1.8.7/bin}/pyflyby/_version.py

@@ -5,4 +5,4 @@
 
 
 
-__version__ = '1.8.6'
+__version__ = '1.8.7'

{pyflyby-1.8.6 → pyflyby-1.8.7}/bin/tidy-imports

@@ -27,10 +27,10 @@ import sys
 import os
 
 from   pyflyby._cmdline         import hfmt, parse_args, process_actions
-from   pyflyby._imports2s       import (canonicalize_imports,
-                                        fix_unused_and_missing_imports,
-                                        replace_star_imports,
-                                        transform_imports)
+from pyflyby._imports2s import (canonicalize_imports,
+                                fix_unused_and_missing_imports,
+                                replace_star_imports,
+                                transform_imports, sort_imports)
 from   pyflyby._log             import logger
 
 import toml
@@ -145,20 +145,23 @@ def main():
         parser.set_defaults(**default_config)
     options, args = parse_args(
         _add_opts_and_defaults, import_format_params=True, modify_action_params=True, defaults=default_config)
+
     def modify(x):
-        if options.canonicalize:
-            x = canonicalize_imports(x, params=options.params)
         if options.transformations:
             x = transform_imports(x, options.transformations,
                                   params=options.params)
         if options.replace_star_imports:
             x = replace_star_imports(x, params=options.params)
-        return fix_unused_and_missing_imports(
+        x = fix_unused_and_missing_imports(
             x, params=options.params,
             add_missing=options.add_missing,
             remove_unused=options.remove_unused,
             add_mandatory=options.add_mandatory,
             )
+        sorted_imports = sort_imports(x)
+        if options.canonicalize:
+            sorted_imports = canonicalize_imports(sorted_imports, params=options.params)
+        return sorted_imports
     process_actions(args, options.actions, modify)
 
 

{pyflyby-1.8.6 → pyflyby-1.8.7}/lib/python/pyflyby/_autoimp.py

@@ -609,17 +609,13 @@ class _MissingImportFinder(object):
         #     scope.
         #   - Store the name in the current scope (but not visibly to
         #     args/decorator_list).
-        if sys.version_info >= (3, 8):
-            assert node._fields == ('name', 'args', 'body', 'decorator_list', 'returns', 'type_comment'), node._fields
-        else:
-            assert node._fields == ('name', 'args', 'body', 'decorator_list', 'returns'), node._fields
+        assert node._fields == ('name', 'args', 'body', 'decorator_list', 'returns', 'type_comment'), node._fields
         with self._NewScopeCtx(include_class_scopes=True):
             self.visit(node.args)
             self.visit(node.decorator_list)
             if node.returns:
                 self.visit(node.returns)
-            if sys.version_info >= (3, 8):
-                self._visit_typecomment(node.type_comment)
+            self._visit_typecomment(node.type_comment)
             old_in_FunctionDef = self._in_FunctionDef
             self._in_FunctionDef = True
             with self._NewScopeCtx(unhide_classdef=True):
@@ -671,10 +667,7 @@ class _MissingImportFinder(object):
         self.visit(node)
 
     def visit_arguments(self, node):
-        if sys.version_info >= (3, 8):
-            assert node._fields == ('posonlyargs', 'args', 'vararg', 'kwonlyargs', 'kw_defaults', 'kwarg', 'defaults'), node._fields
-        else:
-            assert node._fields == ('args', 'vararg', 'kwonlyargs', 'kw_defaults', 'kwarg', 'defaults'), node._fields
+        assert node._fields == ('posonlyargs', 'args', 'vararg', 'kwonlyargs', 'kw_defaults', 'kwarg', 'defaults'), node._fields
         # Argument/parameter list.  Note that the defaults should be
         # considered "Load"s from the upper scope, and the argument names are
         # "Store"s in the function scope.
@@ -693,8 +686,7 @@ class _MissingImportFinder(object):
         # Store arg names.
         self.visit(node.args)
         self.visit(node.kwonlyargs)
-        if sys.version_info >= (3, 8):
-            self.visit(node.posonlyargs)
+        self.visit(node.posonlyargs)
         # may be None.
         if node.vararg:
             self.visit(node.vararg)
@@ -807,16 +799,12 @@ class _MissingImportFinder(object):
         self._visit_fullname(node.id, node.ctx)
 
     def visit_arg(self, node):
-        if sys.version_info >= (3, 8):
-            assert node._fields == ('arg', 'annotation', 'type_comment'), node._fields
-        else:
-            assert node._fields == ('arg', 'annotation'), node._fields
+        assert node._fields == ('arg', 'annotation', 'type_comment'), node._fields
         if node.annotation:
             self.visit(node.annotation)
         # Treat it like a Name node would from Python 2
         self._visit_fullname(node.arg, ast.Param())
-        if sys.version_info >= (3, 8):
-            self._visit_typecomment(node.type_comment)
+        self._visit_typecomment(node.type_comment)
 
     def visit_Attribute(self, node):
         name_revparts = []
@@ -1512,8 +1500,7 @@ def find_missing_imports(arg, namespaces):
             else:
                 return []
         # Parse the string into an AST.
-        kw = {} if sys.version_info < (3, 8) else {'type_comments': True}
-        node = ast.parse(arg, **kw) # may raise SyntaxError
+        node = ast.parse(arg, type_comments=True) # may raise SyntaxError
         # Get missing imports from AST.
         return _find_missing_imports_in_ast(node, namespaces)
     elif isinstance(arg, PythonBlock):