From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 22 May 2010 12:02:35 +0000 (+0000)
Subject: Issue #8749: remove unused code in Objects/object.c.  Thanks Yaniv Aknin.
X-Git-Tag: v3.2a1~713
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fff532bef328f78ac149123845b1962d9ca5ba59;p=python

Issue #8749: remove unused code in Objects/object.c.  Thanks Yaniv Aknin.
---

diff --git a/Objects/object.c b/Objects/object.c
index 7907a8e566..0802348455 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -950,31 +950,7 @@ PyObject_GenericGetAttr(PyObject *obj, PyObject *name)
             goto done;
     }
 
-#if 0 /* XXX this is not quite _PyType_Lookup anymore */
-    /* Inline _PyType_Lookup */
-    {
-        Py_ssize_t i, n;
-        PyObject *mro, *base, *dict;
-
-        /* Look in tp_dict of types in MRO */
-        mro = tp->tp_mro;
-        assert(mro != NULL);
-        assert(PyTuple_Check(mro));
-        n = PyTuple_GET_SIZE(mro);
-        for (i = 0; i < n; i++) {
-            base = PyTuple_GET_ITEM(mro, i);
-            assert(PyType_Check(base));
-            dict = ((PyTypeObject *)base)->tp_dict;
-            assert(dict && PyDict_Check(dict));
-            descr = PyDict_GetItem(dict, name);
-            if (descr != NULL)
-                break;
-        }
-    }
-#else
     descr = _PyType_Lookup(tp, name);
-#endif
-
     Py_XINCREF(descr);
 
     f = NULL;