diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 15 | ||||
| -rw-r--r-- | Python/structmember.c | 4 |
2 files changed, 6 insertions, 13 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 9a9b98e..07dfdc2 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3409,14 +3409,8 @@ PyEval_GetFuncName(PyObject *func) return PyString_AsString(((PyFunctionObject*)func)->func_name); else if (PyCFunction_Check(func)) return ((PyCFunctionObject*)func)->m_ml->ml_name; - else if (PyClass_Check(func)) - return PyString_AsString(((PyClassObject*)func)->cl_name); - else if (PyInstance_Check(func)) { - return PyString_AsString( - ((PyInstanceObject*)func)->in_class->cl_name); - } else { + else return func->ob_type->tp_name; - } } const char * @@ -3428,13 +3422,8 @@ PyEval_GetFuncDesc(PyObject *func) return "()"; else if (PyCFunction_Check(func)) return "()"; - else if (PyClass_Check(func)) - return " constructor"; - else if (PyInstance_Check(func)) { - return " instance"; - } else { + else return " object"; - } } static void diff --git a/Python/structmember.c b/Python/structmember.c index 54eb055..688a4b8 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -126,6 +126,10 @@ PyMember_GetOne(const char *addr, PyMemberDef *l) v = PyLong_FromUnsignedLongLong(*(unsigned PY_LONG_LONG *)addr); break; #endif /* HAVE_LONG_LONG */ + case T_NONE: + v = Py_None; + Py_INCREF(v); + break; default: PyErr_SetString(PyExc_SystemError, "bad memberdescr type"); v = NULL; |