Merged revisions 69217,69219 via svnmerge from

gpolo · gpolo · commit 7f42395b6d78 · 2009-02-02T21:17:09.000Z
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
@@ -152,6 +152,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #1581476: Always use the Tcl global namespace when calling into Tcl.
+
 - Fix a bug in the trace module where a bytes object from co_lnotab had its
   items being passed through ord().
 
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -1236,8 +1236,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)){
