diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-16 07:26:10 +0100 |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-16 07:26:10 +0100 |
| commit | 81da4bba221acd5b8cef18f154e360bc93a87664 (patch) | |
| tree | 7a68dfc8aae756631fcd7ae85fc0fe3ec7b91cb1 /Python/errors.c | |
| parent | 0af37fbc56ae6aaccab23c642142744f4e83871f (diff) | |
| parent | ed0554245885ec75c9f84bcaaebe232ac210b7b7 (diff) | |
| download | cpython-81da4bba221acd5b8cef18f154e360bc93a87664.tar.gz | |
Issue #26920: Merge 3.6
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/errors.c b/Python/errors.c index 918f4dffab..d459fae622 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -158,10 +158,10 @@ PyErr_SetString(PyObject *exception, const char *string) } -PyObject * +PyObject* _Py_HOT_FUNCTION PyErr_Occurred(void) { - PyThreadState *tstate = _PyThreadState_UncheckedGet(); + PyThreadState *tstate = PyThreadState_GET(); return tstate == NULL ? NULL : tstate->curexc_type; } |