diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-03-24 15:28:52 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-03-24 15:28:52 (GMT) |
| commit | 944fbcc478e36523add77574e172caf518647c74 (patch) | |
| tree | 2aaa3be535201b0b936dc64bd878a7b4eadb0f59 /Lib | |
| parent | 381a9bce9762fe2db4a7951f689df4d06ba53f79 (diff) | |
| download | cpython-944fbcc478e36523add77574e172caf518647c74.zip cpython-944fbcc478e36523add77574e172caf518647c74.tar.gz cpython-944fbcc478e36523add77574e172caf518647c74.tar.bz2 | |
Issue #23571: Enhance _Py_CheckFunctionResult()
Too bad, sometimes Py_FatalError() is unable to write the exception into
sys.stderr (on "AMD64 OpenIndiana 3.x" buildbot, the buildbot was probably out
of memory).
Call Py_FatalError() with a different message for the two cases (result+error,
or no result and no error).
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_capi.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index 8a92d6b..fbd1466 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -185,8 +185,8 @@ class CAPITest(unittest.TestCase): """) rc, out, err = assert_python_failure('-c', code) self.assertRegex(err.replace(b'\r', b''), - br'Fatal Python error: ' - br'Function result is invalid\n' + br'Fatal Python error: a function returned NULL ' + br'without setting an error\n' br'SystemError: <built-in function ' br'return_null_without_error> returned NULL ' br'without setting an error\n' @@ -212,8 +212,8 @@ class CAPITest(unittest.TestCase): """) rc, out, err = assert_python_failure('-c', code) self.assertRegex(err.replace(b'\r', b''), - br'Fatal Python error: ' - br'Function result is invalid\n' + br'Fatal Python error: a function returned a ' + br'result with an error set\n' br'ValueError\n' br'\n' br'During handling of the above exception, ' |