diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-08-18 16:14:15 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-08-18 16:14:15 (GMT) |
| commit | 0a6996d87d19a524c2a11dd315d96d12083c47d4 (patch) | |
| tree | 291cd0aa99adb9e0800d34393a75ebde33eaa595 /Python | |
| parent | 989df09db23f2e7588a9e88c6d05611d3c411582 (diff) | |
| parent | eec9331b207cf7def6f04156d00a8479d1630dd3 (diff) | |
| download | cpython-0a6996d87d19a524c2a11dd315d96d12083c47d4.zip cpython-0a6996d87d19a524c2a11dd315d96d12083c47d4.tar.gz cpython-0a6996d87d19a524c2a11dd315d96d12083c47d4.tar.bz2 | |
Merge 3.5 (fix raise)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 07ac167..8e7d5c2 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4154,7 +4154,7 @@ do_raise(PyObject *exc, PyObject *cause) type = tstate->exc_type; value = tstate->exc_value; tb = tstate->exc_traceback; - if (type == Py_None) { + if (type == Py_None || type == NULL) { PyErr_SetString(PyExc_RuntimeError, "No active exception to reraise"); return 0; |