Commit 023004b5 authored by Serhiy Storchaka's avatar Serhiy Storchaka

Merge heads

parents b8a6417d 4d97d0b8
...@@ -12,6 +12,9 @@ Core and Builtins ...@@ -12,6 +12,9 @@ Core and Builtins
Library 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 - Issue #19037: The mailbox module now makes all changes to maildir files
before moving them into place, to avoid race conditions with other programs before moving them into place, to avoid race conditions with other programs
that may be accessing the maildir directory. that may be accessing the maildir directory.
......
...@@ -1107,10 +1107,7 @@ Tkapp_CallResult(TkappObject *self) ...@@ -1107,10 +1107,7 @@ Tkapp_CallResult(TkappObject *self)
res = FromObj((PyObject*)self, value); res = FromObj((PyObject*)self, value);
Tcl_DecrRefCount(value); Tcl_DecrRefCount(value);
} else { } else {
const char *s = Tcl_GetStringResult(self->interp); res = PyUnicode_FromString(Tcl_GetStringResult(self->interp));
const char *p = s;
res = PyUnicode_FromStringAndSize(s, (int)(p-s));
} }
return res; return res;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment