summaryrefslogtreecommitdiffstats
path: root/Objects/object.c
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-01-14 00:29:41 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-01-14 00:29:41 (GMT)
commite4c270c2a887d251966fae5bfc93dbe2b312ee73 (patch)
tree3f396736d6317de4675f92db7d3dca04cc7a32ee /Objects/object.c
parent08ccf202e606a066668f4ef85df9a9c0d07e1ba1 (diff)
downloadcpython-e4c270c2a887d251966fae5bfc93dbe2b312ee73.zip
cpython-e4c270c2a887d251966fae5bfc93dbe2b312ee73.tar.gz
cpython-e4c270c2a887d251966fae5bfc93dbe2b312ee73.tar.bz2
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
now that ctypes uses a more supported method to create types: Method cache optimization, by Armin Rigo, ported to 2.6 by Kevin Jacobs.
Diffstat (limited to 'Objects/object.c')
-rw-r--r--Objects/object.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Objects/object.c b/Objects/object.c
index 788e732..dbe5658 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1287,6 +1287,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;
@@ -1311,6 +1312,9 @@ PyObject_GenericGetAttr(PyObject *obj, PyObject *name)
break;
}
}
+#else
+ descr = _PyType_Lookup(tp, name);
+#endif
Py_XINCREF(descr);