[Python-checkins] cpython (merge default -> default): Merge heads

[serhiy.storchaka]

http://hg.python.org/cpython/rev/0fd72636de2b
changeset:   85764:0fd72636de2b
parent:      85761:900bf633b7f4
parent:      85763:65dd0de6b4a5
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Sep 20 23:28:27 2013 +0300
summary:
  Merge heads

files:
  Misc/NEWS          |  3 +++
  Modules/_tkinter.c |  5 +----
  2 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 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
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1107,10 +1107,7 @@
         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;
 }

-- 
Repository URL: http://hg.python.org/cpython