summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilherme Polo <ggpolo@gmail.com>2009-02-02 21:15:41 (GMT)
committerGuilherme Polo <ggpolo@gmail.com>2009-02-02 21:15:41 (GMT)
commitb2dbd4309aa3d2a8a823d251447b8fd8b4b2d7e3 (patch)
tree0e10a8bdf617192317dbd7b33d800976153e30f4
parent8bcbbb4e3b89d01de0e5275ea2e0adbef60a43d3 (diff)
downloadcpython-b2dbd4309aa3d2a8a823d251447b8fd8b4b2d7e3.zip
cpython-b2dbd4309aa3d2a8a823d251447b8fd8b4b2d7e3.tar.gz
cpython-b2dbd4309aa3d2a8a823d251447b8fd8b4b2d7e3.tar.bz2
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 ........
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_tkinter.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 106b08a..8f4e485 100644
--- 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 f101450..c1060f6 100644
--- 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)){