diff options
author | Guilherme Polo <ggpolo@gmail.com> | 2009-02-02 21:17:09 (GMT) |
---|---|---|
committer | Guilherme Polo <ggpolo@gmail.com> | 2009-02-02 21:17:09 (GMT) |
commit | 7f42395b6d78a7c8e6b2ef2623c181aa93084269 (patch) | |
tree | 3f6dcc51d3825d8feadf8a6405e058fa1f959e8a | |
parent | 3c16165c432206f76c654a0cd7e092f776f21433 (diff) | |
download | cpython-7f42395b6d78a7c8e6b2ef2623c181aa93084269.zip cpython-7f42395b6d78a7c8e6b2ef2623c181aa93084269.tar.gz cpython-7f42395b6d78a7c8e6b2ef2623c181aa93084269.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/NEWS | 2 | ||||
-rw-r--r-- | Modules/_tkinter.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -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 index 81ec6a0..eed7177 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)){ |