diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-15 17:04:53 +0100 |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-15 17:04:53 +0100 |
| commit | 22454df994214799dddfc7e7aaf96fae51f002a9 (patch) | |
| tree | 9f6d20388764189e841eb192ffe64b85fcad71f9 /Python/errors.c | |
| parent | 4a8fb90ed576b89bc7274f892d3428ac518a58d0 (diff) | |
| parent | 980554ec4d992135f53e5a919047c835b7a68925 (diff) | |
| download | cpython-22454df994214799dddfc7e7aaf96fae51f002a9.tar.gz | |
Issue 28668: 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; } |