summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-09-20 20:28:27 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-09-20 20:28:27 (GMT)
commit1eb87629cd975c5219eb3b6d7759fca0d77330b2 (patch)
treec69bf2fc5bec3ee6965acd73bd55f21ffd33a7c7 /Modules
parentb4a46cb428428ac4fe6fc18257459d8a460ebd9d (diff)
parentdac8b8b7a6540344aee5c4b84a9963890890a5e3 (diff)
downloadcpython-1eb87629cd975c5219eb3b6d7759fca0d77330b2.zip
cpython-1eb87629cd975c5219eb3b6d7759fca0d77330b2.tar.gz
cpython-1eb87629cd975c5219eb3b6d7759fca0d77330b2.tar.bz2
Merge heads
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_tkinter.c5
1 files changed, 1 insertions, 4 deletions
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;
}