Merge 3.5

Issue #26154: Add a new private _PyThreadState_UncheckedGet() function.
This commit is contained in:
Victor Stinner 2016-01-20 11:19:46 +01:00
commit b56837a033
7 changed files with 42 additions and 26 deletions

View file

@ -1396,7 +1396,7 @@ error:
Py_XDECREF(name);
Py_XDECREF(value);
/* No return value, therefore clear error state if possible */
if (_Py_atomic_load_relaxed(&_PyThreadState_Current))
if (_PyThreadState_UncheckedGet())
PyErr_Clear();
}