PR: (Permanent Draft) record EKR's experiments

rope/base/arguments.py

@@ -1,5 +1,6 @@
+import ast
+
 import rope.base.evaluate
-from rope.base import ast
 
 
 class Arguments:

rope/base/builtins.py

@@ -1,11 +1,11 @@
 """This module tries to support builtin types and functions."""
+import ast
 import inspect
 import io
 
 import rope.base.evaluate
 from rope.base import (
     arguments,
-    ast,
     pynames,
     pyobjects,
     utils,

rope/base/evaluate.py

@@ -1,3 +1,4 @@
+import ast
 from operator import itemgetter
 from typing import Optional, Tuple
 
@@ -6,11 +7,11 @@
 import rope.base.pyobjects
 from rope.base import (
     arguments,
-    ast,
     nameanalyze,
     exceptions,
     pyobjects,
     pyobjectsdef,
+    rast,
     worder,
 )
 
@@ -50,7 +51,7 @@ def eval_str(holding_scope, name):
 def eval_str2(holding_scope, name):
     try:
         # parenthesizing for handling cases like 'a_var.\nattr'
-        node = ast.parse("(%s)" % name)
+        node = rast.parse("(%s)" % name)
     except SyntaxError:
         raise BadIdentifierError("Not a resolvable python identifier selected.")
     return eval_node2(holding_scope, node)
@@ -158,7 +159,7 @@ def _find_module(self, module_name):
         )
 
 
-class StatementEvaluator(ast.RopeNodeVisitor):
+class StatementEvaluator(rast.RopeNodeVisitor):
     def __init__(self, scope):
         self.scope = scope
         self.result = None

rope/base/nameanalyze.py

@@ -1,4 +1,6 @@
-from rope.base import ast
+import ast
+
+from rope.base import rast
 
 
 def get_name_levels(node):
@@ -18,7 +20,7 @@ def get_name_levels(node):
     return visitor.names
 
 
-class _NodeNameCollector(ast.RopeNodeVisitor):
+class _NodeNameCollector(rast.RopeNodeVisitor):
     def __init__(self, levels=None):
         self.names = []
         self.levels = levels

rope/base/oi/soa.py

@@ -1,7 +1,8 @@
-import rope.base.ast
+import ast
+
 import rope.base.oi.soi
 import rope.base.pynames
-from rope.base import pyobjects, evaluate, nameanalyze, arguments
+from rope.base import arguments, pyobjects, evaluate, nameanalyze, rast
 
 
 def analyze_module(pycore, pymodule, should_analyze, search_subscopes, followed_calls):
@@ -33,11 +34,11 @@ def _follow(pyfunction):
         if not followed_calls:
             _follow = None
         visitor = SOAVisitor(pycore, pydefined, _follow)
-        for child in rope.base.ast.iter_child_nodes(pydefined.get_ast()):
+        for child in ast.iter_child_nodes(pydefined.get_ast()):
             visitor.visit(child)
 
 
-class SOAVisitor(rope.base.ast.RopeNodeVisitor):
+class SOAVisitor(rast.RopeNodeVisitor):
     def __init__(self, pycore, pydefined, follow_callback=None):
         self.pycore = pycore
         self.pymodule = pydefined.get_module()
@@ -51,7 +52,7 @@ def _ClassDef(self, node):
         pass
 
     def _Call(self, node):
-        for child in rope.base.ast.iter_child_nodes(node):
+        for child in ast.iter_child_nodes(node):
             self.visit(child)
         primary, pyname = evaluate.eval_node2(self.scope, node.func)
         if pyname is None:
@@ -99,7 +100,7 @@ def _parameter_objects(self, pyfunction):
         ]
 
     def _AnnAssign(self, node):
-        for child in rope.base.ast.iter_child_nodes(node):
+        for child in ast.iter_child_nodes(node):
             self.visit(child)
         visitor = _SOAAssignVisitor()
         nodes = []
@@ -110,7 +111,7 @@ def _AnnAssign(self, node):
         self._evaluate_assign_value(node, nodes, type_hint=node.annotation)
 
     def _Assign(self, node):
-        for child in rope.base.ast.iter_child_nodes(node):
+        for child in ast.iter_child_nodes(node):
             self.visit(child)
         visitor = _SOAAssignVisitor()
         nodes = []
@@ -145,7 +146,7 @@ def __init__(self):
         self.nodes = []
 
     def _added(self, node, levels):
-        if isinstance(node, rope.base.ast.Subscript) and isinstance(
-            node.slice, (rope.base.ast.Index, rope.base.ast.expr)
+        if isinstance(node, ast.Subscript) and isinstance(
+            node.slice, (ast.Index, ast.expr)
         ):
             self.nodes.append((node, levels))

rope/base/oi/type_hinting/providers/numpydocstrings.py

@@ -3,8 +3,9 @@
 https://github.com/davidhalter/jedi/blob/b489019f5bd5750051122b94cc767df47751ecb7/jedi/evaluate/docstrings.py
 Thanks to @davidhalter for this utils under MIT License.
 """
+import ast
 import re
-from rope.base.ast import literal_eval
+
 from rope.base.oi.type_hinting.providers import docstrings
 
 try:
@@ -26,7 +27,7 @@ def __call__(self, docstring, param_name):
                     p_type = m.group(1)
 
                 if p_type.startswith("{"):
-                    types = {type(x).__name__ for x in literal_eval(p_type)}
+                    types = {type(x).__name__ for x in ast.literal_eval(p_type)}
                     return list(types)
                 else:
                     return [p_type]

rope/base/prefs.py

@@ -215,7 +215,7 @@ def add(self, key: str, value: Any):
             self[key] = []
         getattr(self, key).append(value)
 
-    def get(self, key: str, default: Any = None):
+    def get(self, key: str, default: Any=None):
         """Get the value of the key preference"""
         return getattr(self, key, default)
 

rope/base/pynamesdef.py

@@ -1,6 +1,5 @@
 import rope.base.oi.soi
-from rope.base import pynames
-from rope.base.pynames import *
+from rope.base import pynames, utils
 
 
 class AssignedName(pynames.AssignedName):

rope/base/pyobjects.py

@@ -1,6 +1,7 @@
+import ast
 from typing import Optional
 
-from rope.base import ast, exceptions, utils
+from rope.base import exceptions, utils
 
 
 class PyObject:

rope/base/pyobjectsdef.py

@@ -1,13 +1,16 @@
+import ast
+
 import rope.base.builtins
 import rope.base.codeanalyze
 import rope.base.evaluate
 import rope.base.libutils
 import rope.base.oi.soi
 import rope.base.pyscopes
 from rope.base import (
+    pynames,
     pynamesdef,
     exceptions,
-    ast,
+    rast,
     nameanalyze,
     pyobjects,
     fscommands,
@@ -177,7 +180,7 @@ def __init__(self, pycore, source=None, resource=None, force_errors=False):
                 raise
             else:
                 source = "\n"
-                node = ast.parse("\n")
+                node = rast.parse("\n")
         self.source_code = source
         self.star_imports = []
         self.visitor_class = _GlobalVisitor
@@ -197,7 +200,7 @@ def _init_source(self, pycore, source_code, resource):
                     source_bytes = fscommands.unicode_to_file_data(source_code)
                 else:
                     source_bytes = source_code
-            ast_node = ast.parse(source_bytes, filename=filename)
+            ast_node = rast.parse(source_bytes, filename=filename)
         except SyntaxError as e:
             raise exceptions.ModuleSyntaxError(filename, e.lineno, e.msg)
         except UnicodeDecodeError as e:
@@ -239,7 +242,7 @@ def __init__(self, pycore, resource=None, force_errors=False):
                 init_dot_py, force_errors=force_errors
             ).get_ast()
         else:
-            ast_node = ast.parse("\n")
+            ast_node = rast.parse("\n")
         super().__init__(pycore, ast_node, resource)
 
     def _create_structural_attributes(self):
@@ -251,7 +254,7 @@ def _create_structural_attributes(self):
         if self.resource is None:
             return result
         for name, resource in self._get_child_resources().items():
-            result[name] = pynamesdef.ImportedModule(self, resource=resource)
+            result[name] = pynames.ImportedModule(self, resource=resource)
         return result
 
     def _create_concluded_attributes(self):
@@ -291,7 +294,7 @@ def get_name(self):
         return rope.base.libutils.modname(self.resource) if self.resource else ""
 
 
-class _AnnAssignVisitor(ast.RopeNodeVisitor):
+class _AnnAssignVisitor(rast.RopeNodeVisitor):
     def __init__(self, scope_visitor):
         self.scope_visitor = scope_visitor
         self.assigned_ast = None
@@ -307,7 +310,7 @@ def _assigned(self, name, assignment=None):
         self.scope_visitor._assigned(name, assignment)
 
     def _Name(self, node):
-        assignment = pynamesdef.AssignmentValue(
+        assignment = pynames.AssignmentValue(
             self.assigned_ast, assign_type=True, type_hint=self.type_hint
         )
         self._assigned(node.id, assignment)
@@ -317,7 +320,7 @@ def _Tuple(self, node):
         for name, levels in names:
             assignment = None
             if self.assigned_ast is not None:
-                assignment = pynamesdef.AssignmentValue(self.assigned_ast, levels)
+                assignment = pynames.AssignmentValue(self.assigned_ast, levels)
             self._assigned(name, assignment)
 
     def _Annotation(self, node):
@@ -333,7 +336,7 @@ def _Slice(self, node):
         pass
 
 
-class _ExpressionVisitor(ast.RopeNodeVisitor):
+class _ExpressionVisitor(rast.RopeNodeVisitor):
     def __init__(self, scope_visitor):
         self.scope_visitor = scope_visitor
 
@@ -360,7 +363,7 @@ def _NamedExpr(self, node):
         self.visit(node.value)
 
 
-class _AssignVisitor(ast.RopeNodeVisitor):
+class _AssignVisitor(rast.RopeNodeVisitor):
     def __init__(self, scope_visitor):
         self.scope_visitor = scope_visitor
         self.assigned_ast = None
@@ -377,15 +380,16 @@ def _assigned(self, name, assignment=None):
     def _Name(self, node):
         assignment = None
         if self.assigned_ast is not None:
-            assignment = pynamesdef.AssignmentValue(self.assigned_ast)
+            assignment = pynames.AssignmentValue(self.assigned_ast)
+
         self._assigned(node.id, assignment)
 
     def _Tuple(self, node):
         names = nameanalyze.get_name_levels(node)
         for name, levels in names:
             assignment = None
             if self.assigned_ast is not None:
-                assignment = pynamesdef.AssignmentValue(self.assigned_ast, levels)
+                assignment = pynames.AssignmentValue(self.assigned_ast, levels)
             self._assigned(name, assignment)
 
     def _Attribute(self, node):
@@ -414,7 +418,7 @@ def get_module(self):
 
     def _ClassDef(self, node):
         pyclass = PyClass(self.pycore, node, self.owner_object)
-        self.names[node.name] = pynamesdef.DefinedName(pyclass)
+        self.names[node.name] = pynames.DefinedName(pyclass)
         self.defineds.append(pyclass)
 
     def _FunctionDef(self, node):
@@ -423,7 +427,7 @@ def _FunctionDef(self, node):
             if isinstance(decorator, ast.Name) and decorator.id == "property":
                 if isinstance(self, _ClassVisitor):
                     type_ = rope.base.builtins.Property(pyfunction)
-                    arg = pynamesdef.UnboundName(
+                    arg = pynames.UnboundName(
                         rope.base.pyobjects.PyObject(self.owner_object)
                     )
 
@@ -434,12 +438,12 @@ def _eval(type_=type_, arg=arg):
 
                     lineno = utils.guess_def_lineno(self.get_module(), node)
 
-                    self.names[node.name] = pynamesdef.EvaluatedName(
+                    self.names[node.name] = pynames.EvaluatedName(
                         _eval, module=self.get_module(), lineno=lineno
                     )
                     break
         else:
-            self.names[node.name] = pynamesdef.DefinedName(pyfunction)
+            self.names[node.name] = pynames.DefinedName(pyfunction)
         self.defineds.append(pyfunction)
 
     def _AsyncFunctionDef(self, node):
@@ -476,12 +480,12 @@ def _update_evaluated(
     ):
         result = {}
         if isinstance(targets, str):
-            assignment = pynamesdef.AssignmentValue(assigned, [], evaluation, eval_type)
+            assignment = pynames.AssignmentValue(assigned, [], evaluation, eval_type)
             self._assigned(targets, assignment)
         else:
             names = nameanalyze.get_name_levels(targets)
             for name, levels in names:
-                assignment = pynamesdef.AssignmentValue(
+                assignment = pynames.AssignmentValue(
                     assigned, levels, evaluation, eval_type
                 )
                 self._assigned(name, assignment)
@@ -519,19 +523,19 @@ def _Import(self, node):
             alias = import_pair.asname
             first_package = module_name.split(".")[0]
             if alias is not None:
-                imported = pynamesdef.ImportedModule(self.get_module(), module_name)
+                imported = pynames.ImportedModule(self.get_module(), module_name)
                 if not self._is_ignored_import(imported):
                     self.names[alias] = imported
             else:
-                imported = pynamesdef.ImportedModule(self.get_module(), first_package)
+                imported = pynames.ImportedModule(self.get_module(), first_package)
                 if not self._is_ignored_import(imported):
                     self.names[first_package] = imported
 
     def _ImportFrom(self, node):
         level = 0
         if node.level:
             level = node.level
-        imported_module = pynamesdef.ImportedModule(
+        imported_module = pynames.ImportedModule(
             self.get_module(),
             node.module or "",
             level,
@@ -547,7 +551,7 @@ def _ImportFrom(self, node):
                 alias = imported_name.asname
                 if alias is not None:
                     imported = alias
-                self.names[imported] = pynamesdef.ImportedName(
+                self.names[imported] = pynames.ImportedName(
                     imported_module, imported_name.name
                 )
 
@@ -636,7 +640,7 @@ def _Attribute(self, node):
                 pyname = self.scope_visitor.names[node.attr]
                 if isinstance(pyname, pynamesdef.AssignedName):
                     pyname.assignments.append(
-                        pynamesdef.AssignmentValue(self.assigned_ast)
+                        pynames.AssignmentValue(self.assigned_ast)
                     )
 
     def _Tuple(self, node):
@@ -670,5 +674,5 @@ def get_names(self):
         imported = self.imported_module.get_object()
         for name in imported:
             if not name.startswith("_"):
-                result[name] = pynamesdef.ImportedName(self.imported_module, name)
+                result[name] = pynames.ImportedName(self.imported_module, name)
         return result