mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

use the static identifier api for looking up special methods

Browse source 
I had to move the static identifier code from unicodeobject.h to object.h in
order for this to work.
This commit is contained in:
Benjamin Peterson 2012-01-22 11:24:29 -05:00
parent cd8991255c
commit ce79852077
11 changed files with 153 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Python/ceval.c
View file

@ -138,7 +138,7 @@ static void format_exc_check_arg(PyObject *, const char *, PyObject *);
static void format_exc_unbound(PyCodeObject *co, int oparg);
static PyObject * unicode_concatenate(PyObject *, PyObject *,
PyFrameObject *, unsigned char *);
static PyObject * special_lookup(PyObject *, char *, PyObject **);
static PyObject * special_lookup(PyObject *, _Py_Identifier *);
#define NAME_ERROR_MSG \
"name '%.200s' is not defined"
@ -2540,13 +2540,14 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
TARGET(SETUP_WITH)
{
static PyObject *exit, *enter;
_Py_IDENTIFIER(__exit__);
_Py_IDENTIFIER(__enter__);
w = TOP();
x = special_lookup(w, "__exit__", &exit);
x = special_lookup(w, &PyId___exit__);
if (!x)
break;
SET_TOP(x);
u = special_lookup(w, "__enter__", &enter);
u = special_lookup(w, &PyId___enter__);
Py_DECREF(w);
if (!u) {
x = NULL;
@ -3440,12 +3441,12 @@ fail: /* Jump here from prelude on failure */
static PyObject *
special_lookup(PyObject *o, char *meth, PyObject **cache)
special_lookup(PyObject *o, _Py_Identifier *id)
{
PyObject *res;
res = _PyObject_LookupSpecial(o, meth, cache);
res = _PyObject_LookupSpecial(o, id);
if (res == NULL && !PyErr_Occurred()) {
PyErr_SetObject(PyExc_AttributeError, *cache);
PyErr_SetObject(PyExc_AttributeError, id->object);
return NULL;
}
return res;

6
Python/sysmodule.c
View file

@ -814,10 +814,11 @@ static PyObject *
sys_getsizeof(PyObject *self, PyObject *args, PyObject *kwds)
{
PyObject *res = NULL;
static PyObject *str__sizeof__ = NULL, *gc_head_size = NULL;
static PyObject *gc_head_size = NULL;
static char *kwlist[] = {"object", "default", 0};
PyObject *o, *dflt = NULL;
PyObject *method;
_Py_IDENTIFIER(__sizeof__);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:getsizeof",
kwlist, &o, &dflt))
@ -834,8 +835,7 @@ sys_getsizeof(PyObject *self, PyObject *args, PyObject *kwds)
if (PyType_Ready(Py_TYPE(o)) < 0)
return NULL;
method = _PyObject_LookupSpecial(o, "__sizeof__",
&str__sizeof__);
method = _PyObject_LookupSpecial(o, &PyId___sizeof__);
if (method == NULL) {
if (!PyErr_Occurred())
PyErr_Format(PyExc_TypeError,