From: Guilherme Polo <ggpolo@gmail.com>
Date: Mon, 2 Feb 2009 21:23:52 +0000 (+0000)
Subject: Merged revisions 69222 via svnmerge from
X-Git-Tag: v3.0.1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae0803cd66efb18bd31662dbb171756dce8dfa74;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 69222 via svnmerge from
svn+ssh://pythondev/python/branches/py3k

................
  r69222 | guilherme.polo | 2009-02-02 19:17:09 -0200 (Mon, 02 Feb 2009) | 13 lines

  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 9566e3b0f681..d3ac95c06639 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -108,6 +108,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 81ec6a06899e..eed7177731e5 100644
--- 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)){