diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2013-07-11 20:34:47 +0300 |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-07-11 20:34:47 +0300 |
commit | 6119fa614d76bff09b12d4da4c562ac8cc25d363 (patch) | |
tree | 478f0d788f6e9d20fdb7f2b41592841ff2440ba5 /Modules/_tkinter.c | |
parent | 6929ad47c75515fb42513e97f62cea23d855ab46 (diff) | |
download | cpython-6119fa614d76bff09b12d4da4c562ac8cc25d363.tar.gz |
Issue #18101: Tcl.split() now process strings nested in a tuple as it
do with byte strings.
Added tests for Tcl.split() and Tcl.splitline().
Diffstat (limited to 'Modules/_tkinter.c')
-rw-r--r-- | Modules/_tkinter.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index d18c7f06cb..cdb28e52c3 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -519,6 +519,21 @@ SplitObj(PyObject *arg) return result; /* Fall through, returning arg. */ } + else if (PyUnicode_Check(arg)) { + int argc; + char **argv; + char *list = PyUnicode_AsUTF8(arg); + + if (list == NULL || + Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) { + Py_INCREF(arg); + return arg; + } + Tcl_Free(FREECAST argv); + if (argc > 1) + return Split(list); + /* Fall through, returning arg. */ + } else if (PyBytes_Check(arg)) { int argc; char **argv; |