PR: Simplify Rope's class hierarchy

rope/base/arguments.py

@@ -1,5 +1,6 @@
 import rope.base.evaluate
 from rope.base import ast
+from rope.base.pyobjects import is_abstract_class
 
 
 class Arguments:
@@ -104,8 +105,8 @@ def _is_method_call(primary, pyfunction):
         and isinstance(pyfunction.parent, rope.base.pyobjects.PyClass)
     ):
         return True
-    if isinstance(
-        pyobject.get_type(), rope.base.pyobjects.AbstractClass
-    ) and isinstance(pyfunction, rope.base.builtins.BuiltinFunction):
+    if is_abstract_class(pyobject.get_type()) and isinstance(
+        pyfunction, rope.base.builtins.BuiltinFunction
+    ):
         return True
     return False

rope/base/builtins.py

@@ -4,11 +4,13 @@
 
 import rope.base.evaluate
 from rope.base import arguments, ast, pynames, pyobjects, utils
+from rope.base.pyobjects import get_base_type
+from rope.base.pyobjects import is_abstract_class, is_abstract_function
 
 
-class BuiltinModule(pyobjects.AbstractModule):
+class BuiltinModule(pyobjects.PyObject):  # was pyobjects.AbstractModule.
     def __init__(self, name, pycore=None, initial={}):
-        super().__init__()
+        super().__init__(get_base_type("Module"))
         self.name = name
         self.pycore = pycore
         self.initial = initial
@@ -68,10 +70,11 @@ def parent(self):
         return self._parent
 
 
-class BuiltinClass(_BuiltinElement, pyobjects.AbstractClass):
+class BuiltinClass(_BuiltinElement, pyobjects.PyObject):
+    # was (_BuiltinElement, pyobjects.AbstractClass).
     def __init__(self, builtin, attributes, parent=None):
+        pyobjects.PyObject.__init__(self, get_base_type("Type"))
         _BuiltinElement.__init__(self, builtin, parent)
-        pyobjects.AbstractClass.__init__(self)
         self.initial = attributes
 
     @utils.saveit
@@ -83,13 +86,17 @@ def get_attributes(self):
     def get_module(self):
         return builtins
 
+    def get_superclasses(self):
+        return []
 
-class BuiltinFunction(_BuiltinElement, pyobjects.AbstractFunction):
+
+class BuiltinFunction(_BuiltinElement, pyobjects.PyObject):
+    # was (_BuiltinElement, pyobjects.AbstractFunction).
     def __init__(
         self, returned=None, function=None, builtin=None, argnames=[], parent=None
     ):
+        pyobjects.PyObject.__init__(self, get_base_type("Function"))
         _BuiltinElement.__init__(self, builtin, parent)
-        pyobjects.AbstractFunction.__init__(self)
         self.argnames = argnames
         self.returned = returned
         self.function = function
@@ -580,9 +587,9 @@ def get_definition_location(self):
         return (None, None)
 
 
-class Iterator(pyobjects.AbstractClass):
+class Iterator(pyobjects.PyObject):  # was pyobjects.AbstractClass
     def __init__(self, holding=None):
-        super().__init__()
+        super().__init__(get_base_type("Type"))
         self.holding = holding
         self.attributes = {
             "next": BuiltinName(BuiltinFunction(self.holding)),
@@ -599,9 +606,9 @@ def get_returned_object(self, args):
 get_iterator = _create_builtin_getter(Iterator)
 
 
-class Generator(pyobjects.AbstractClass):
+class Generator(pyobjects.PyObject):  # was pyobjects.AbstractClass.
     def __init__(self, holding=None):
-        super().__init__()
+        super().__init__(get_base_type("Type"))
         self.holding = holding
         self.attributes = {
             "next": BuiltinName(BuiltinFunction(self.holding)),
@@ -672,7 +679,7 @@ def __init__(self, fget=None, fset=None, fdel=None, fdoc=None):
         super().__init__(property, attributes)
 
     def get_property_object(self, args):
-        if isinstance(self._fget, pyobjects.AbstractFunction):
+        if is_abstract_function(self._fget):
             return self._fget.get_returned_object(args)
 
 
@@ -681,9 +688,9 @@ def _property_function(args):
     return pyobjects.PyObject(Property(parameters[0]))
 
 
-class Lambda(pyobjects.AbstractFunction):
+class Lambda(pyobjects.PyObject):  # was pyobjects.AbstractFunction.
     def __init__(self, node, scope):
-        super().__init__()
+        super().__init__(get_base_type("Function"))
         self.node = node
         self.arguments = node.args
         self.scope = scope
@@ -743,7 +750,7 @@ def _infer_sequence_for_pyname(pyname):
     args = arguments.ObjectArguments([pyname])
     if "__iter__" in seq:
         obj = seq["__iter__"].get_object()
-        if not isinstance(obj, pyobjects.AbstractFunction):
+        if not is_abstract_function(obj):
             return None
         iter = obj.get_returned_object(args)
         if iter is not None and "next" in iter:
@@ -783,14 +790,12 @@ def _super_function(args):
     passed_class, passed_self = args.get_arguments(["type", "self"])
     if passed_self is None:
         return passed_class
-    else:
-        # pyclass = passed_self.get_type()
-        pyclass = passed_class
-        if isinstance(pyclass, pyobjects.AbstractClass):
-            supers = pyclass.get_superclasses()
-            if supers:
-                return pyobjects.PyObject(supers[0])
-        return passed_self
+    pyclass = passed_class
+    if is_abstract_class(pyclass):
+        supers = pyclass.get_superclasses()
+        if supers:
+            return pyobjects.PyObject(supers[0])
+    return passed_self
 
 
 def _zip_function(args):

rope/base/evaluate.py

@@ -9,10 +9,11 @@
     ast,
     exceptions,
     nameanalyze,
-    pyobjects,
+    # pyobjects,
     pyobjectsdef,
     worder,
 )
+from rope.base.pyobjects import is_abstract_class, is_abstract_function
 
 BadIdentifierError = exceptions.BadIdentifierError
 
@@ -100,7 +101,7 @@ def get_primary_and_pyname_at(
             if isinstance(pyobject, pyobjectsdef.PyFunction):
                 parameter_name = pyobject.get_parameters().get(keyword_name, None)
                 return (None, parameter_name)
-            elif isinstance(pyobject, pyobjects.AbstractFunction):
+            if is_abstract_function(pyobject):
                 parameter_name = rope.base.pynames.ParameterName()
                 return (None, parameter_name)
         # class body
@@ -138,11 +139,9 @@ def get_enclosing_function(self, offset):
             function_pyname = None
         if function_pyname is not None:
             pyobject = function_pyname.get_object()
-            if isinstance(pyobject, pyobjects.AbstractFunction):
+            if is_abstract_function(pyobject):
                 return pyobject
-            elif (
-                isinstance(pyobject, pyobjects.AbstractClass) and "__init__" in pyobject
-            ):
+            elif is_abstract_class(pyobject) and "__init__" in pyobject:
                 return pyobject["__init__"].get_object()
             elif "__call__" in pyobject:
                 return pyobject["__call__"].get_object()
@@ -186,7 +185,7 @@ def _get_returned(pyobject):
             args = arguments.create_arguments(primary, pyobject, node, self.scope)
             return pyobject.get_returned_object(args)
 
-        if isinstance(pyobject, rope.base.pyobjects.AbstractClass):
+        if is_abstract_class(pyobject):
             result = None
             if "__new__" in pyobject:
                 new_function = pyobject["__new__"].get_object()
@@ -197,7 +196,7 @@ def _get_returned(pyobject):
             return
 
         pyfunction = None
-        if isinstance(pyobject, rope.base.pyobjects.AbstractFunction):
+        if is_abstract_function(pyobject):
             pyfunction = pyobject
         elif "__call__" in pyobject:
             pyfunction = pyobject["__call__"].get_object()
@@ -339,13 +338,12 @@ def _Slice(self, node):
 
     def _call_function(self, node, function_name, other_args=None):
         pyname = eval_node(self.scope, node)
-        if pyname is not None:
-            pyobject = pyname.get_object()
-        else:
+        if pyname is None:
             return
+        pyobject = pyname.get_object()
         if function_name in pyobject:
             called = pyobject[function_name].get_object()
-            if not called or not isinstance(called, pyobjects.AbstractFunction):
+            if not called or not is_abstract_function(called):
                 return
             args = [node]
             if other_args:

rope/base/oi/soa.py

@@ -2,6 +2,7 @@
 import rope.base.oi.soi
 import rope.base.pynames
 from rope.base import arguments, evaluate, nameanalyze, pyobjects
+from rope.base.pyobjects import is_abstract_class, is_abstract_function
 
 
 def analyze_module(pycore, pymodule, should_analyze, search_subscopes, followed_calls):
@@ -55,9 +56,10 @@ def _Call(self, node):
         if pyname is None:
             return
         pyfunction = pyname.get_object()
-        if isinstance(pyfunction, pyobjects.AbstractFunction):
+        if is_abstract_function(pyfunction):
             args = arguments.create_arguments(primary, pyfunction, node, self.scope)
-        elif isinstance(pyfunction, pyobjects.PyClass):
+        # elif isinstance(pyfunction, pyobjects.PyClass):
+        elif is_abstract_class(pyfunction):
             pyclass = pyfunction
             if "__init__" in pyfunction:
                 pyfunction = pyfunction["__init__"].get_object()

rope/base/oi/soi.py

@@ -7,6 +7,7 @@
 import rope.base.builtins  # Use full qualification for clarity.
 from rope.base import arguments, evaluate, pynames, pyobjects, utils
 from rope.base.oi.type_hinting.factory import get_type_hinting_factory
+from rope.base.pyobjects import is_abstract_function
 
 _ignore_inferred = utils.ignore_exception(pyobjects.IsBeingInferredError)
 
@@ -201,7 +202,7 @@ def _follow_evaluations(assignment, pyname, pyobject):
             if new_pyname is not None:
                 pyobject = new_pyname.get_object()
         if pyobject is not None and call:
-            if isinstance(pyobject, pyobjects.AbstractFunction):
+            if is_abstract_function(pyobject):
                 args = arguments.ObjectArguments([pyname])
                 pyobject = pyobject.get_returned_object(args)
             else:

rope/base/oi/transform.py

@@ -4,6 +4,7 @@
 
 import rope.base.builtins  # Use full qualification for clarity.
 from rope.base import exceptions
+from rope.base.pyobjects import is_abstract_class
 
 
 class PyObjectToTextual:
@@ -32,7 +33,7 @@ def __call__(self, pyobject):
         return self.transform(pyobject)
 
     def PyObject_to_textual(self, pyobject):
-        if isinstance(pyobject.get_type(), rope.base.pyobjects.AbstractClass):
+        if is_abstract_class(pyobject.get_type()):
             result = self.transform(pyobject.get_type())
             if result[0] == "defined":
                 return ("instance", result)