mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge heads

Browse source
This commit is contained in:
Serhiy Storchaka 2013-09-20 23:28:27 +03:00
commit 1eb87629cd
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -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.

5
Modules/_tkinter.c
View file

@ -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;
} }