[Python-checkins] r69220 - in python/branches/release26-maint: Misc/NEWS Modules/_tkinter.c

[guilherme.polo]

Author: guilherme.polo
Date: Mon Feb  2 22:15:41 2009
New Revision: 69220

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/_tkinter.c

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Mon Feb  2 22:15:41 2009
@@ -76,6 +76,8 @@
 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").

Modified: python/branches/release26-maint/Modules/_tkinter.c
==============================================================================
--- python/branches/release26-maint/Modules/_tkinter.c	(original)
+++ python/branches/release26-maint/Modules/_tkinter.c	Mon Feb  2 22:15:41 2009
@@ -1284,8 +1284,7 @@
 	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)){