Remove bpython.inspection.is_new_style which always returns True

sebastinas · sebastinas · commit b4424a3791c6 · 2020-10-13T21:18:30.000+02:00
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -72,20 +72,19 @@ def __enter__(self):
         # original methods. :-(
         # The upshot being that introspecting on an object to display its
         # attributes will avoid unwanted side-effects.
-        if is_new_style(self.obj):
-            __getattr__ = getattr(type_, "__getattr__", None)
-            if __getattr__ is not None:
-                try:
-                    setattr(type_, "__getattr__", (lambda *_, **__: None))
-                except TypeError:
-                    __getattr__ = None
-            __getattribute__ = getattr(type_, "__getattribute__", None)
-            if __getattribute__ is not None:
-                try:
-                    setattr(type_, "__getattribute__", object.__getattribute__)
-                except TypeError:
-                    # XXX: This happens for e.g. built-in types
-                    __getattribute__ = None
+        __getattr__ = getattr(type_, "__getattr__", None)
+        if __getattr__ is not None:
+            try:
+                setattr(type_, "__getattr__", (lambda *_, **__: None))
+            except TypeError:
+                __getattr__ = None
+        __getattribute__ = getattr(type_, "__getattribute__", None)
+        if __getattribute__ is not None:
+            try:
+                setattr(type_, "__getattribute__", object.__getattribute__)
+            except TypeError:
+                # XXX: This happens for e.g. built-in types
+                __getattribute__ = None
         self.attribs = (__getattribute__, __getattr__)
         # /Dark magic
 
@@ -101,10 +100,6 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         # /Dark magic
 
 
-def is_new_style(obj):
-    return True
-
-
 class _Repr(object):
     """
     Helper for `fixlongargs()`: Returns the given value in `__repr__()`.
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -57,14 +57,6 @@ def test_is_callable(self):
         self.assertFalse(inspection.is_callable(None))
         self.assertTrue(inspection.is_callable(CallableMethod().method))
 
-    def test_is_new_style_py3(self):
-        self.assertTrue(inspection.is_new_style(spam))
-        self.assertTrue(inspection.is_new_style(Noncallable))
-        self.assertTrue(inspection.is_new_style(OldNoncallable))
-        self.assertTrue(inspection.is_new_style(Noncallable()))
-        self.assertTrue(inspection.is_new_style(OldNoncallable()))
-        self.assertTrue(inspection.is_new_style(None))
-
     def test_parsekeywordpairs(self):
         # See issue #109
         def fails(spam=["-a", "-b"]):
