diff options
-rw-r--r-- | cffi/_embedding.h | 3 | ||||
-rw-r--r-- | testing/embedding/test_basic.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cffi/_embedding.h b/cffi/_embedding.h index fb851bb..30842c1 100644 --- a/cffi/_embedding.h +++ b/cffi/_embedding.h @@ -145,6 +145,7 @@ static int _cffi_initialize_python(void) int result; PyGILState_STATE state; PyObject *pycode=NULL, *global_dict=NULL, *x; + PyObject *builtins; state = PyGILState_Ensure(); @@ -169,7 +170,7 @@ static int _cffi_initialize_python(void) global_dict = PyDict_New(); if (global_dict == NULL) goto error; - PyObject *builtins = PyEval_GetBuiltins(); + builtins = PyEval_GetBuiltins(); if (builtins == NULL) goto error; if (PyDict_SetItemString(global_dict, "__builtins__", builtins) < 0) diff --git a/testing/embedding/test_basic.py b/testing/embedding/test_basic.py index bafdcbb..894ace5 100644 --- a/testing/embedding/test_basic.py +++ b/testing/embedding/test_basic.py @@ -63,8 +63,8 @@ class EmbeddingTests: output = popen.stdout.read() err = popen.wait() if err: - raise OSError("popen failed with exit code %r: %r" % ( - err, args)) + raise OSError(("popen failed with exit code %r: %r\n\n%s" % ( + err, args, output)).rstrip()) print(output.rstrip()) return output |