mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222)
Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
This commit is contained in:
Serhiy Storchaka
INADA Naoki
parent
2b822a0bb1
commit
f320be77ff
22 changed files with 1455 additions and 1442 deletions
|
|
@ -367,18 +367,15 @@ init_method_ref(PyObject *self, _Py_Identifier *name,
|
|||
PyObject **method_func, PyObject **method_self)
|
||||
{
|
||||
PyObject *func, *func2;
|
||||
int ret;
|
||||
|
||||
/* *method_func and *method_self should be consistent. All refcount decrements
|
||||
should be occurred after setting *method_self and *method_func. */
|
||||
func = _PyObject_GetAttrId(self, name);
|
||||
ret = _PyObject_LookupAttrId(self, name, &func);
|
||||
if (func == NULL) {
|
||||
*method_self = NULL;
|
||||
Py_CLEAR(*method_func);
|
||||
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
||||
return -1;
|
||||
}
|
||||
PyErr_Clear();
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (PyMethod_Check(func) && PyMethod_GET_SELF(func) == self) {
|
||||
|
|
@ -1155,11 +1152,12 @@ _Pickler_SetOutputStream(PicklerObject *self, PyObject *file)
|
|||
{
|
||||
_Py_IDENTIFIER(write);
|
||||
assert(file != NULL);
|
||||
self->write = _PyObject_GetAttrId(file, &PyId_write);
|
||||
if (_PyObject_LookupAttrId(file, &PyId_write, &self->write) < 0) {
|
||||
return -1;
|
||||
}
|
||||
if (self->write == NULL) {
|
||||
if (PyErr_ExceptionMatches(PyExc_AttributeError))
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"file must have a 'write' attribute");
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"file must have a 'write' attribute");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -1504,19 +1502,16 @@ _Unpickler_SetInputStream(UnpicklerObject *self, PyObject *file)
|
|||
_Py_IDENTIFIER(read);
|
||||
_Py_IDENTIFIER(readline);
|
||||
|
||||
self->peek = _PyObject_GetAttrId(file, &PyId_peek);
|
||||
if (self->peek == NULL) {
|
||||
if (PyErr_ExceptionMatches(PyExc_AttributeError))
|
||||
PyErr_Clear();
|
||||
else
|
||||
return -1;
|
||||
if (_PyObject_LookupAttrId(file, &PyId_peek, &self->peek) < 0) {
|
||||
return -1;
|
||||
}
|
||||
self->read = _PyObject_GetAttrId(file, &PyId_read);
|
||||
self->readline = _PyObject_GetAttrId(file, &PyId_readline);
|
||||
(void)_PyObject_LookupAttrId(file, &PyId_read, &self->read);
|
||||
(void)_PyObject_LookupAttrId(file, &PyId_readline, &self->readline);
|
||||
if (self->readline == NULL || self->read == NULL) {
|
||||
if (PyErr_ExceptionMatches(PyExc_AttributeError))
|
||||
if (!PyErr_Occurred()) {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"file must have 'read' and 'readline' attributes");
|
||||
}
|
||||
Py_CLEAR(self->read);
|
||||
Py_CLEAR(self->readline);
|
||||
Py_CLEAR(self->peek);
|
||||
|
|
@ -1691,7 +1686,7 @@ get_deep_attribute(PyObject *obj, PyObject *names, PyObject **pparent)
|
|||
PyObject *name = PyList_GET_ITEM(names, i);
|
||||
Py_XDECREF(parent);
|
||||
parent = obj;
|
||||
obj = PyObject_GetAttr(parent, name);
|
||||
(void)_PyObject_LookupAttr(parent, name, &obj);
|
||||
if (obj == NULL) {
|
||||
Py_DECREF(parent);
|
||||
return NULL;
|
||||
|
|
@ -1704,16 +1699,6 @@ get_deep_attribute(PyObject *obj, PyObject *names, PyObject **pparent)
|
|||
return obj;
|
||||
}
|
||||
|
||||
static void
|
||||
reformat_attribute_error(PyObject *obj, PyObject *name)
|
||||
{
|
||||
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
||||
PyErr_Clear();
|
||||
PyErr_Format(PyExc_AttributeError,
|
||||
"Can't get attribute %R on %R", name, obj);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static PyObject *
|
||||
getattribute(PyObject *obj, PyObject *name, int allow_qualname)
|
||||
|
|
@ -1727,10 +1712,13 @@ getattribute(PyObject *obj, PyObject *name, int allow_qualname)
|
|||
attr = get_deep_attribute(obj, dotted_path, NULL);
|
||||
Py_DECREF(dotted_path);
|
||||
}
|
||||
else
|
||||
attr = PyObject_GetAttr(obj, name);
|
||||
if (attr == NULL)
|
||||
reformat_attribute_error(obj, name);
|
||||
else {
|
||||
(void)_PyObject_LookupAttr(obj, name, &attr);
|
||||
}
|
||||
if (attr == NULL && !PyErr_Occurred()) {
|
||||
PyErr_Format(PyExc_AttributeError,
|
||||
"Can't get attribute %R on %R", name, obj);
|
||||
}
|
||||
return attr;
|
||||
}
|
||||
|
||||
|
|
@ -1748,9 +1736,6 @@ _checkmodule(PyObject *module_name, PyObject *module,
|
|||
|
||||
PyObject *candidate = get_deep_attribute(module, dotted_path, NULL);
|
||||
if (candidate == NULL) {
|
||||
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
||||
PyErr_Clear();
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
if (candidate != global) {
|
||||
|
|
@ -1772,14 +1757,10 @@ whichmodule(PyObject *global, PyObject *dotted_path)
|
|||
_Py_IDENTIFIER(modules);
|
||||
_Py_IDENTIFIER(__main__);
|
||||
|
||||
module_name = _PyObject_GetAttrId(global, &PyId___module__);
|
||||
|
||||
if (module_name == NULL) {
|
||||
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
||||
return NULL;
|
||||
PyErr_Clear();
|
||||
if (_PyObject_LookupAttrId(global, &PyId___module__, &module_name) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
else {
|
||||
if (module_name) {
|
||||
/* In some rare cases (e.g., bound methods of extension types),
|
||||
__module__ can be None. If it is so, then search sys.modules for
|
||||
the module of global. */
|
||||
|
|
@ -3328,12 +3309,8 @@ save_global(PicklerObject *self, PyObject *obj, PyObject *name)
|
|||
global_name = name;
|
||||
}
|
||||
else {
|
||||
global_name = _PyObject_GetAttrId(obj, &PyId___qualname__);
|
||||
if (global_name == NULL) {
|
||||
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
||||
goto error;
|
||||
PyErr_Clear();
|
||||
}
|
||||
if (_PyObject_LookupAttrId(obj, &PyId___qualname__, &global_name) < 0)
|
||||
goto error;
|
||||
if (global_name == NULL) {
|
||||
global_name = _PyObject_GetAttrId(obj, &PyId___name__);
|
||||
if (global_name == NULL)
|
||||
|
|
@ -3656,13 +3633,9 @@ get_class(PyObject *obj)
|
|||
PyObject *cls;
|
||||
_Py_IDENTIFIER(__class__);
|
||||
|
||||
cls = _PyObject_GetAttrId(obj, &PyId___class__);
|
||||
if (cls == NULL) {
|
||||
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
||||
PyErr_Clear();
|
||||
cls = (PyObject *) Py_TYPE(obj);
|
||||
Py_INCREF(cls);
|
||||
}
|
||||
if (_PyObject_LookupAttrId(obj, &PyId___class__, &cls) == 0) {
|
||||
cls = (PyObject *) Py_TYPE(obj);
|
||||
Py_INCREF(cls);
|
||||
}
|
||||
return cls;
|
||||
}
|
||||
|
|
@ -3734,14 +3707,10 @@ save_reduce(PicklerObject *self, PyObject *args, PyObject *obj)
|
|||
PyObject *name;
|
||||
_Py_IDENTIFIER(__name__);
|
||||
|
||||
name = _PyObject_GetAttrId(callable, &PyId___name__);
|
||||
if (name == NULL) {
|
||||
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
||||
return -1;
|
||||
}
|
||||
PyErr_Clear();
|
||||
if (_PyObject_LookupAttrId(callable, &PyId___name__, &name) < 0) {
|
||||
return -1;
|
||||
}
|
||||
else if (PyUnicode_Check(name)) {
|
||||
if (name != NULL && PyUnicode_Check(name)) {
|
||||
_Py_IDENTIFIER(__newobj_ex__);
|
||||
use_newobj_ex = _PyUnicode_EqualToASCIIId(
|
||||
name, &PyId___newobj_ex__);
|
||||
|
|
@ -4108,7 +4077,9 @@ save(PicklerObject *self, PyObject *obj, int pers_save)
|
|||
don't actually have to check for a __reduce__ method. */
|
||||
|
||||
/* Check for a __reduce_ex__ method. */
|
||||
reduce_func = _PyObject_GetAttrId(obj, &PyId___reduce_ex__);
|
||||
if (_PyObject_LookupAttrId(obj, &PyId___reduce_ex__, &reduce_func) < 0) {
|
||||
goto error;
|
||||
}
|
||||
if (reduce_func != NULL) {
|
||||
PyObject *proto;
|
||||
proto = PyLong_FromLong(self->proto);
|
||||
|
|
@ -4119,12 +4090,6 @@ save(PicklerObject *self, PyObject *obj, int pers_save)
|
|||
else {
|
||||
PickleState *st = _Pickle_GetGlobalState();
|
||||
|
||||
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
||||
PyErr_Clear();
|
||||
}
|
||||
else {
|
||||
goto error;
|
||||
}
|
||||
/* Check for a __reduce__ method. */
|
||||
reduce_func = _PyObject_GetAttrId(obj, &PyId___reduce__);
|
||||
if (reduce_func != NULL) {
|
||||
|
|
@ -4401,13 +4366,9 @@ _pickle_Pickler___init___impl(PicklerObject *self, PyObject *file,
|
|||
return -1;
|
||||
}
|
||||
|
||||
self->dispatch_table = _PyObject_GetAttrId((PyObject *)self,
|
||||
&PyId_dispatch_table);
|
||||
if (self->dispatch_table == NULL) {
|
||||
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
||||
return -1;
|
||||
}
|
||||
PyErr_Clear();
|
||||
if (_PyObject_LookupAttrId((PyObject *)self,
|
||||
&PyId_dispatch_table, &self->dispatch_table) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -5370,12 +5331,11 @@ instantiate(PyObject *cls, PyObject *args)
|
|||
if (!PyTuple_GET_SIZE(args) && PyType_Check(cls)) {
|
||||
_Py_IDENTIFIER(__getinitargs__);
|
||||
_Py_IDENTIFIER(__new__);
|
||||
PyObject *func = _PyObject_GetAttrId(cls, &PyId___getinitargs__);
|
||||
PyObject *func;
|
||||
if (_PyObject_LookupAttrId(cls, &PyId___getinitargs__, &func) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
if (func == NULL) {
|
||||
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
||||
return NULL;
|
||||
}
|
||||
PyErr_Clear();
|
||||
return _PyObject_CallMethodIdObjArgs(cls, &PyId___new__, cls, NULL);
|
||||
}
|
||||
Py_DECREF(func);
|
||||
|
|
@ -6225,16 +6185,11 @@ load_build(UnpicklerObject *self)
|
|||
|
||||
inst = self->stack->data[Py_SIZE(self->stack) - 1];
|
||||
|
||||
setstate = _PyObject_GetAttrId(inst, &PyId___setstate__);
|
||||
if (setstate == NULL) {
|
||||
if (PyErr_ExceptionMatches(PyExc_AttributeError))
|
||||
PyErr_Clear();
|
||||
else {
|
||||
Py_DECREF(state);
|
||||
return -1;
|
||||
}
|
||||
if (_PyObject_LookupAttrId(inst, &PyId___setstate__, &setstate) < 0) {
|
||||
Py_DECREF(state);
|
||||
return -1;
|
||||
}
|
||||
else {
|
||||
if (setstate != NULL) {
|
||||
PyObject *result;
|
||||
|
||||
/* The explicit __setstate__ is responsible for everything. */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue