aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Evans <dje@google.com>2010-04-08 04:57:25 +0000
committerDoug Evans <dje@google.com>2010-04-08 04:57:25 +0000
commiteb5cda8649d496847e9ae93b06ec80a94a5edb84 (patch)
tree27a39e0b620089e476665d22cb57d951ae96ff8b
parent9957b18fba5800ffed38d04de237f8b642dc46dc (diff)
downloadgdb-eb5cda8649d496847e9ae93b06ec80a94a5edb84.zip
gdb-eb5cda8649d496847e9ae93b06ec80a94a5edb84.tar.gz
gdb-eb5cda8649d496847e9ae93b06ec80a94a5edb84.tar.bz2
* python/python.c (source_python_script): Use ensure_python_env
to prepare environment for script.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/python/python.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ccd5227..f234f29 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-07 Doug Evans <dje@google.com>
+
+ * python/python.c (source_python_script): Use ensure_python_env
+ to prepare environment for script.
+
2010-04-07 H.J. Lu <hongjiu.lu@intel.com>
* amd64-linux-nat.c: Include "regset.h", "elf/common.h",
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 9a89eed..5ce4829 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -367,14 +367,14 @@ gdbpy_parse_and_eval (PyObject *self, PyObject *args)
void
source_python_script (FILE *stream, char *file)
{
- PyGILState_STATE state;
+ struct cleanup *cleanup;
- state = PyGILState_Ensure ();
+ cleanup = ensure_python_env (get_current_arch (), current_language);
PyRun_SimpleFile (stream, file);
fclose (stream);
- PyGILState_Release (state);
+ do_cleanups (cleanup);
}