diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-01-20 10:19:46 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-01-20 10:19:46 (GMT) |
| commit | b56837a03358ee2a3374fc0004488179c6771442 (patch) | |
| tree | 59d848efeabdc78d807d2eb3c462635f7cf3876a /Python/sysmodule.c | |
| parent | 5ccbf79eaea74814a16618879919ff470dc5131f (diff) | |
| parent | bfd316e750bc3040c08d1b5872e2de188e8c1e5f (diff) | |
| download | cpython-b56837a03358ee2a3374fc0004488179c6771442.zip cpython-b56837a03358ee2a3374fc0004488179c6771442.tar.gz cpython-b56837a03358ee2a3374fc0004488179c6771442.tar.bz2 | |
Merge 3.5
Issue #26154: Add a new private _PyThreadState_UncheckedGet() function.
Diffstat (limited to 'Python/sysmodule.c')
| -rw-r--r-- | Python/sysmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 53dd4a1..702e8f0 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -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(); } |