Merged revisions 69217,69219 via svnmerge from

svn+ssh://pythondev/python/trunk

........
  r69217 | guilherme.polo | 2009-02-02 19:08:32 -0200 (Mon, 02 Feb 2009) | 1 line

  Fix for issue #1581476
........
  r69219 | guilherme.polo | 2009-02-02 19:14:14 -0200 (Mon, 02 Feb 2009) | 1 line

  NEWS entry for issue #1581476
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 106b08a419e594d3e9d3329fd8cfbd8daae301cd..8f4e485f61cfcb9b9c030461d1d07e8bad4dbbf2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -76,6 +76,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #1581476: Always use the Tcl global namespace when calling into Tcl.
+
 - Issue #2047: shutil.move() could believe that its destination path was
   inside its source path if it began with the same letters (e.g. "src" vs.
   "src.new").

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index f101450de3627aec5811a26901bf8a5a5fdd5ef4..c1060f6d4cb9896d5b940c18d2331c3da81ff5ed 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1284,8 +1284,7 @@ Tkapp_Call(PyObject *selfptr, PyObject *args)
        int objc, i;
        PyObject *res = NULL;
        TkappObject *self = (TkappObject*)selfptr;
-       /* Could add TCL_EVAL_GLOBAL if wrapped by GlobalCall... */
-       int flags = TCL_EVAL_DIRECT;
+       int flags = TCL_EVAL_DIRECT | TCL_EVAL_GLOBAL;
 
        /* If args is a single tuple, replace with contents of tuple */
        if (1 == PyTuple_Size(args)){