diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-09-20 20:28:27 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-09-20 20:28:27 (GMT) |
| commit | 1eb87629cd975c5219eb3b6d7759fca0d77330b2 (patch) | |
| tree | c69bf2fc5bec3ee6965acd73bd55f21ffd33a7c7 | |
| parent | b4a46cb428428ac4fe6fc18257459d8a460ebd9d (diff) | |
| parent | dac8b8b7a6540344aee5c4b84a9963890890a5e3 (diff) | |
| download | cpython-1eb87629cd975c5219eb3b6d7759fca0d77330b2.zip cpython-1eb87629cd975c5219eb3b6d7759fca0d77330b2.tar.gz cpython-1eb87629cd975c5219eb3b6d7759fca0d77330b2.tar.bz2 | |
Merge heads
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_tkinter.c | 5 |
2 files changed, 4 insertions, 4 deletions
@@ -12,6 +12,9 @@ Core and Builtins Library ------- +- Issue #3015: Fixed tkinter with wantobject=False. Any Tcl command call + returned empty string. + - Issue #19037: The mailbox module now makes all changes to maildir files before moving them into place, to avoid race conditions with other programs that may be accessing the maildir directory. diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index bef7837..7b58fd8 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -1107,10 +1107,7 @@ Tkapp_CallResult(TkappObject *self) res = FromObj((PyObject*)self, value); Tcl_DecrRefCount(value); } else { - const char *s = Tcl_GetStringResult(self->interp); - const char *p = s; - - res = PyUnicode_FromStringAndSize(s, (int)(p-s)); + res = PyUnicode_FromString(Tcl_GetStringResult(self->interp)); } return res; } |