PR for #569: rename pynames to pynamesdef in pyobjectsdef.ph (#572)

Rename pyobjects to pyobjectsdef

Author: edreamleo

rope/base/pyobjectsdef.py

@@ -5,7 +5,7 @@
 import rope.base.oi.soi
 import rope.base.pyscopes
 from rope.base import (
-    pynamesdef as pynames,
+    pynamesdef,
     exceptions,
     ast,
     astutils,
@@ -21,10 +21,10 @@ def __init__(self, pycore, ast_node, parent):
         rope.base.pyobjects.AbstractFunction.__init__(self)
         rope.base.pyobjects.PyDefinedObject.__init__(self, pycore, ast_node, parent)
         self.arguments = self.ast_node.args
-        self.parameter_pyobjects = pynames._Inferred(
+        self.parameter_pyobjects = pynamesdef._Inferred(
             self._infer_parameters, self.get_module()._get_concluded_data()
         )
-        self.returned = pynames._Inferred(self._infer_returned)
+        self.returned = pynamesdef._Inferred(self._infer_returned)
         self.parameter_pynames = None
 
     def _create_structural_attributes(self):
@@ -61,7 +61,7 @@ def get_parameters(self):
             result = {}
             for index, name in enumerate(self.get_param_names()):
                 # TODO: handle tuple parameters
-                result[name] = pynames.ParameterName(self, index)
+                result[name] = pynamesdef.ParameterName(self, index)
             self.parameter_pynames = result
         return self.parameter_pynames
 
@@ -251,7 +251,7 @@ def _create_structural_attributes(self):
         if self.resource is None:
             return result
         for name, resource in self._get_child_resources().items():
-            result[name] = pynames.ImportedModule(self, resource=resource)
+            result[name] = pynamesdef.ImportedModule(self, resource=resource)
         return result
 
     def _create_concluded_attributes(self):
@@ -307,7 +307,7 @@ def _assigned(self, name, assignment=None):
         self.scope_visitor._assigned(name, assignment)
 
     def _Name(self, node):
-        assignment = pynames.AssignmentValue(
+        assignment = pynamesdef.AssignmentValue(
             self.assigned_ast, assign_type=True, type_hint=self.type_hint
         )
         self._assigned(node.id, assignment)
@@ -317,7 +317,7 @@ def _Tuple(self, node):
         for name, levels in names:
             assignment = None
             if self.assigned_ast is not None:
-                assignment = pynames.AssignmentValue(self.assigned_ast, levels)
+                assignment = pynamesdef.AssignmentValue(self.assigned_ast, levels)
             self._assigned(name, assignment)
 
     def _Annotation(self, node):
@@ -377,15 +377,15 @@ def _assigned(self, name, assignment=None):
     def _Name(self, node):
         assignment = None
         if self.assigned_ast is not None:
-            assignment = pynames.AssignmentValue(self.assigned_ast)
+            assignment = pynamesdef.AssignmentValue(self.assigned_ast)
         self._assigned(node.id, assignment)
 
     def _Tuple(self, node):
         names = astutils.get_name_levels(node)
         for name, levels in names:
             assignment = None
             if self.assigned_ast is not None:
-                assignment = pynames.AssignmentValue(self.assigned_ast, levels)
+                assignment = pynamesdef.AssignmentValue(self.assigned_ast, levels)
             self._assigned(name, assignment)
 
     def _Attribute(self, node):
@@ -414,7 +414,7 @@ def get_module(self):
 
     def _ClassDef(self, node):
         pyclass = PyClass(self.pycore, node, self.owner_object)
-        self.names[node.name] = pynames.DefinedName(pyclass)
+        self.names[node.name] = pynamesdef.DefinedName(pyclass)
         self.defineds.append(pyclass)
 
     def _FunctionDef(self, node):
@@ -423,7 +423,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 = pynames.UnboundName(
+                    arg = pynamesdef.UnboundName(
                         rope.base.pyobjects.PyObject(self.owner_object)
                     )
 
@@ -434,12 +434,12 @@ def _eval(type_=type_, arg=arg):
 
                     lineno = utils.guess_def_lineno(self.get_module(), node)
 
-                    self.names[node.name] = pynames.EvaluatedName(
+                    self.names[node.name] = pynamesdef.EvaluatedName(
                         _eval, module=self.get_module(), lineno=lineno
                     )
                     break
         else:
-            self.names[node.name] = pynames.DefinedName(pyfunction)
+            self.names[node.name] = pynamesdef.DefinedName(pyfunction)
         self.defineds.append(pyfunction)
 
     def _AsyncFunctionDef(self, node):
@@ -465,8 +465,8 @@ def _AsyncFor(self, node):
     def _assigned(self, name, assignment):
         pyname = self.names.get(name, None)
         if pyname is None:
-            pyname = pynames.AssignedName(module=self.get_module())
-        if isinstance(pyname, pynames.AssignedName):
+            pyname = pynamesdef.AssignedName(module=self.get_module())
+        if isinstance(pyname, pynamesdef.AssignedName):
             if assignment is not None:
                 pyname.assignments.append(assignment)
             self.names[name] = pyname
@@ -476,12 +476,12 @@ def _update_evaluated(
     ):
         result = {}
         if isinstance(targets, str):
-            assignment = pynames.AssignmentValue(assigned, [], evaluation, eval_type)
+            assignment = pynamesdef.AssignmentValue(assigned, [], evaluation, eval_type)
             self._assigned(targets, assignment)
         else:
             names = astutils.get_name_levels(targets)
             for name, levels in names:
-                assignment = pynames.AssignmentValue(
+                assignment = pynamesdef.AssignmentValue(
                     assigned, levels, evaluation, eval_type
                 )
                 self._assigned(name, assignment)
@@ -519,19 +519,19 @@ def _Import(self, node):
             alias = import_pair.asname
             first_package = module_name.split(".")[0]
             if alias is not None:
-                imported = pynames.ImportedModule(self.get_module(), module_name)
+                imported = pynamesdef.ImportedModule(self.get_module(), module_name)
                 if not self._is_ignored_import(imported):
                     self.names[alias] = imported
             else:
-                imported = pynames.ImportedModule(self.get_module(), first_package)
+                imported = pynamesdef.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 = pynames.ImportedModule(
+        imported_module = pynamesdef.ImportedModule(
             self.get_module(),
             node.module or "",
             level,
@@ -547,7 +547,7 @@ def _ImportFrom(self, node):
                 alias = imported_name.asname
                 if alias is not None:
                     imported = alias
-                self.names[imported] = pynames.ImportedName(
+                self.names[imported] = pynamesdef.ImportedName(
                     imported_module, imported_name.name
                 )
 
@@ -565,7 +565,7 @@ def _Global(self, node):
                 try:
                     pyname = module[name]
                 except exceptions.AttributeNotFoundError:
-                    pyname = pynames.AssignedName(node.lineno)
+                    pyname = pynamesdef.AssignedName(node.lineno)
             self.names[name] = pyname
 
 
@@ -579,7 +579,7 @@ def _Name(self, node):
             self.names[node.id] = self._get_pyobject(node)
 
     def _get_pyobject(self, node):
-        return pynames.AssignedName(lineno=node.lineno, module=self.get_module())
+        return pynamesdef.AssignedName(lineno=node.lineno, module=self.get_module())
 
 
 class _GlobalVisitor(_ScopeVisitor):
@@ -629,14 +629,14 @@ def _Attribute(self, node):
             return
         if isinstance(node.value, ast.Name) and node.value.id == self.self_name:
             if node.attr not in self.scope_visitor.names:
-                self.scope_visitor.names[node.attr] = pynames.AssignedName(
+                self.scope_visitor.names[node.attr] = pynamesdef.AssignedName(
                     lineno=node.lineno, module=self.scope_visitor.get_module()
                 )
             if self.assigned_ast is not None:
                 pyname = self.scope_visitor.names[node.attr]
-                if isinstance(pyname, pynames.AssignedName):
+                if isinstance(pyname, pynamesdef.AssignedName):
                     pyname.assignments.append(
-                        pynames.AssignmentValue(self.assigned_ast)
+                        pynamesdef.AssignmentValue(self.assigned_ast)
                     )
 
     def _Tuple(self, node):
@@ -670,5 +670,5 @@ def get_names(self):
         imported = self.imported_module.get_object()
         for name in imported:
             if not name.startswith("_"):
-                result[name] = pynames.ImportedName(self.imported_module, name)
+                result[name] = pynamesdef.ImportedName(self.imported_module, name)
         return result