Jacob's Diff

Author: DanielNoord

ChangeLog

@@ -6,8 +6,7 @@ What's New in astroid 2.12.0?
 =============================
 Release date: TBA
 
-* Created ``_DunderCompletionMixin`` in order to let ``ModuleModel`` share
-  the same dunder definitions that were already present on ``FunctionModel``.
+* Promoted most dunder definitions present on ``ModuleModel`` to ``ObjectModel``.
 
   Refs PyCQA/pylint#6094
 

astroid/interpreter/objectmodel.py

@@ -118,15 +118,11 @@ def lookup(self, name):
             return getattr(self, IMPL_PREFIX + name)
         raise AttributeInferenceError(target=self._instance, attribute=name)
 
-
-class _DunderCompletionMixin:
-    """Provide placeholders for further double-underscored methods for the
-    sake of completeness."""
-
     @property
     def attr___ne__(self):
         return node_classes.Unknown()
 
+    attr___doc__ = attr___ne__
     attr___subclasshook__ = attr___ne__
     attr___str__ = attr___ne__
     attr___sizeof__ = attr___ne__
@@ -135,6 +131,8 @@ def attr___ne__(self):
     attr___reduce__ = attr___ne__
     attr___reduce_ex__ = attr___ne__
     attr___new__ = attr___ne__
+    attr___ge__ = attr___ne__
+    attr___le__ = attr___ne__
     attr___lt__ = attr___ne__
     attr___eq__ = attr___ne__
     attr___gt__ = attr___ne__
@@ -143,11 +141,12 @@ def attr___ne__(self):
     attr___getattribute__ = attr___ne__
     attr___hash__ = attr___ne__
     attr___init__ = attr___ne__
+    attr___init_subclass__ = attr___ne__
     attr___dir__ = attr___ne__
     attr___class__ = attr___ne__
 
 
-class ModuleModel(ObjectModel, _DunderCompletionMixin):
+class ModuleModel(ObjectModel):
     def _builtins(self):
         builtins_ast_module = AstroidManager().builtins_module
         return builtins_ast_module.special_attributes.lookup("__dict__")
@@ -224,7 +223,7 @@ def attr___cached__(self):
         return node_classes.Unknown()
 
 
-class FunctionModel(ObjectModel, _DunderCompletionMixin):
+class FunctionModel(ObjectModel):
     @property
     def attr___name__(self):
         return node_classes.Const(value=self._instance.name, parent=self._instance)
@@ -406,9 +405,9 @@ def test(self):
         return DescriptorBoundMethod(proxy=self._instance, bound=self._instance)
 
     # These are here just for completion.
-    attr___call__ = _DunderCompletionMixin.attr___ne__
-    attr___closure__ = _DunderCompletionMixin.attr___ne__
-    attr___code__ = _DunderCompletionMixin.attr___ne__
+    attr___call__ = ObjectModel.attr___ne__
+    attr___closure__ = ObjectModel.attr___ne__
+    attr___code__ = ObjectModel.attr___ne__
 
 
 class ClassModel(ObjectModel):