* python/python.c (source_python_script): Use ensure_python_env

	to prepare environment for script.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ccd5227813937d2e6ce9d7ce87d0c8ca1da2440a..f234f2981760b32802981b1a4c07f83293bb796d 100644 (file)
--- 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 9a89eed142e6d0231eb108f718301b19b0225d6d..5ce4829b5f1896458242c676ba1055f73e66056b 100644 (file)
--- 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);
 }
 
 \f