mirror of
https://github.com/python/cpython.git
synced 2025-07-09 20:35:26 +00:00
bpo-37994: Fix silencing all errors if an attribute lookup fails. (GH-15630)
Only AttributeError should be silenced.
This commit is contained in:
parent
f02ea6225b
commit
41c57b3353
14 changed files with 134 additions and 127 deletions
|
@ -2255,16 +2255,12 @@ builtin_vars(PyObject *self, PyObject *args)
|
|||
return NULL;
|
||||
if (v == NULL) {
|
||||
d = PyEval_GetLocals();
|
||||
if (d == NULL)
|
||||
return NULL;
|
||||
Py_INCREF(d);
|
||||
Py_XINCREF(d);
|
||||
}
|
||||
else {
|
||||
d = _PyObject_GetAttrId(v, &PyId___dict__);
|
||||
if (d == NULL) {
|
||||
if (_PyObject_LookupAttrId(v, &PyId___dict__, &d) == 0) {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"vars() argument must have __dict__ attribute");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
return d;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue