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

some more identifier goodness

This commit is contained in:
Benjamin Peterson 2012-03-20 23:26:41 -04:00
parent 302e7902c8
commit 9fc9bf465a
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Objects/abstract.c
View File

@ -1325,16 +1325,10 @@ PyObject *
PyNumber_Long(PyObject *o) PyNumber_Long(PyObject *o)
{ {
PyNumberMethods *m; PyNumberMethods *m;
static PyObject *trunc_name = NULL;
PyObject *trunc_func; PyObject *trunc_func;
const char *buffer; const char *buffer;
Py_ssize_t buffer_len; Py_ssize_t buffer_len;
_Py_IDENTIFIER(__trunc__);
if (trunc_name == NULL) {
trunc_name = PyUnicode_InternFromString("__trunc__");
if (trunc_name == NULL)
return NULL;
}
if (o == NULL) if (o == NULL)
return null_error(); return null_error();
@ -1356,7 +1350,7 @@ PyNumber_Long(PyObject *o)
} }
if (PyLong_Check(o)) /* An int subclass without nb_int */ if (PyLong_Check(o)) /* An int subclass without nb_int */
return _PyLong_Copy((PyLongObject *)o); return _PyLong_Copy((PyLongObject *)o);
trunc_func = PyObject_GetAttr(o, trunc_name); trunc_func = _PyObject_GetAttrId(o, &PyId___trunc__);
if (trunc_func) { if (trunc_func) {
PyObject *truncated = PyEval_CallObject(trunc_func, NULL); PyObject *truncated = PyEval_CallObject(trunc_func, NULL);
PyObject *int_instance; PyObject *int_instance;
@ -2411,10 +2405,8 @@ PyObject_CallFunctionObjArgs(PyObject *callable, ...)
/* isinstance(), issubclass() */ /* isinstance(), issubclass() */
/* abstract_get_bases() has logically 4 return states, with a sort of 0th /* abstract_get_bases() has logically 4 return states:
* state that will almost never happen.
* *
* 0. creating the __bases__ static string could get a MemoryError
* 1. getattr(cls, '__bases__') could raise an AttributeError * 1. getattr(cls, '__bases__') could raise an AttributeError
* 2. getattr(cls, '__bases__') could raise some other exception * 2. getattr(cls, '__bases__') could raise some other exception
* 3. getattr(cls, '__bases__') could return a tuple * 3. getattr(cls, '__bases__') could return a tuple
@ -2440,16 +2432,11 @@ PyObject_CallFunctionObjArgs(PyObject *callable, ...)
static PyObject * static PyObject *
abstract_get_bases(PyObject *cls) abstract_get_bases(PyObject *cls)
{ {
static PyObject *__bases__ = NULL; _Py_IDENTIFIER(__bases__);
PyObject *bases; PyObject *bases;
if (__bases__ == NULL) {
__bases__ = PyUnicode_InternFromString("__bases__");
if (__bases__ == NULL)
return NULL;
}
Py_ALLOW_RECURSION Py_ALLOW_RECURSION
bases = PyObject_GetAttr(cls, __bases__); bases = _PyObject_GetAttrId(cls, &PyId___bases__);
Py_END_ALLOW_RECURSION Py_END_ALLOW_RECURSION
if (bases == NULL) { if (bases == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError)) if (PyErr_ExceptionMatches(PyExc_AttributeError))
@ -2519,19 +2506,13 @@ static int
recursive_isinstance(PyObject *inst, PyObject *cls) recursive_isinstance(PyObject *inst, PyObject *cls)
{ {
PyObject *icls; PyObject *icls;
static PyObject *__class__ = NULL;
int retval = 0; int retval = 0;
_Py_IDENTIFIER(__class__);
if (__class__ == NULL) {
__class__ = PyUnicode_InternFromString("__class__");
if (__class__ == NULL)
return -1;
}
if (PyType_Check(cls)) { if (PyType_Check(cls)) {
retval = PyObject_TypeCheck(inst, (PyTypeObject *)cls); retval = PyObject_TypeCheck(inst, (PyTypeObject *)cls);
if (retval == 0) { if (retval == 0) {
PyObject *c = PyObject_GetAttr(inst, __class__); PyObject *c = _PyObject_GetAttrId(inst, &PyId___class__);
if (c == NULL) { if (c == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError)) if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_Clear(); PyErr_Clear();
@ -2552,7 +2533,7 @@ recursive_isinstance(PyObject *inst, PyObject *cls)
if (!check_class(cls, if (!check_class(cls,
"isinstance() arg 2 must be a type or tuple of types")) "isinstance() arg 2 must be a type or tuple of types"))
return -1; return -1;
icls = PyObject_GetAttr(inst, __class__); icls = _PyObject_GetAttrId(inst, &PyId___class__);
if (icls == NULL) { if (icls == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError)) if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_Clear(); PyErr_Clear();