Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Revert #2990 patch; it's not necessary as Armin showed.

This commit is contained in:
Georg Brandl 2008-05-29 14:35:39 +00:00
parent 2a9179ac73
commit f18a707205
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Objects/typeobject.c
View File

@ -147,7 +147,7 @@ assign_version_tag(PyTypeObject *type)
cannot be done, 1 if Py_TPFLAGS_VALID_VERSION_TAG.
*/
Py_ssize_t i, n;
PyObject *bases, *tmp;
PyObject *bases;
if (PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG))
return 1;
@ -166,10 +166,9 @@ assign_version_tag(PyTypeObject *type)
are borrowed reference */
for (i = 0; i < (1 << MCACHE_SIZE_EXP); i++) {
method_cache[i].value = NULL;
tmp = method_cache[i].name;
Py_INCREF(Py_None);
Py_XDECREF(method_cache[i].name);
method_cache[i].name = Py_None;
Py_XDECREF(tmp);
Py_INCREF(Py_None);
}
/* mark all version tags as invalid */
PyType_Modified(&PyBaseObject_Type);
@ -2414,7 +2413,7 @@ PyObject *
_PyType_Lookup(PyTypeObject *type, PyObject *name)
{
Py_ssize_t i, n;
PyObject *mro, *res, *base, *dict, *tmp;
PyObject *mro, *res, *base, *dict;
unsigned int h;
if (MCACHE_CACHEABLE_NAME(name) &&
@ -2456,10 +2455,9 @@ _PyType_Lookup(PyTypeObject *type, PyObject *name)
h = MCACHE_HASH_METHOD(type, name);
method_cache[h].version = type->tp_version_tag;
method_cache[h].value = res; /* borrowed */
tmp = method_cache[h].name;
Py_INCREF(name);
Py_DECREF(method_cache[h].name);
method_cache[h].name = name;
Py_DECREF(tmp);
}
return res;
}