(original) (raw)

changeset: 85324:85285e6e28f4 parent: 85322:caf72b44240b parent: 85323:6b841e1ee3b8 user: Serhiy Storchaka storchaka@gmail.com date: Thu Aug 22 17:42:05 2013 +0300 files: Misc/NEWS Modules/_tkinter.c description: Issue #16809: Tkinter's splitlist() and split() methods now accept Tcl_Obj argument. This is needed for support Tcl/Tk 8.6. diff -r caf72b44240b -r 85285e6e28f4 Lib/test/test_tcl.py --- a/Lib/test/test_tcl.py Thu Aug 22 14:03:44 2013 +0100 +++ b/Lib/test/test_tcl.py Thu Aug 22 17:42:05 2013 +0300 @@ -200,6 +200,8 @@ (('a', 3.4), ('a', 3.4)), ((), ()), (call('list', 1, '2', (3.4,)), (1, '2', (3.4,))), + (call('dict', 'create', 1, '\u20ac', b'\xe2\x82\xac', (3.4,)), + (1, '\u20ac', '\u20ac', (3.4,))), ] for arg, res in testcases: self.assertEqual(splitlist(arg), res, msg=arg) @@ -232,6 +234,8 @@ (('a', (2, 3.4)), ('a', (2, 3.4))), ((), ()), (call('list', 1, '2', (3.4,)), (1, '2', (3.4,))), + (call('dict', 'create', 12, '\u20ac', b'\xe2\x82\xac', (3.4,)), + (12, '\u20ac', '\u20ac', (3.4,))), ] for arg, res in testcases: self.assertEqual(split(arg), res, msg=arg) diff -r caf72b44240b -r 85285e6e28f4 Misc/NEWS --- a/Misc/NEWS Thu Aug 22 14:03:44 2013 +0100 +++ b/Misc/NEWS Thu Aug 22 17:42:05 2013 +0300 @@ -38,6 +38,9 @@ Library ------- +- Issue #16809: Tkinter's splitlist() and split() methods now accept Tcl_Obj + argument. + - Issue #18324: set_payload now correctly handles binary input. This also supersedes the previous fixes for #14360, #1717, and #16564. diff -r caf72b44240b -r 85285e6e28f4 Modules/_tkinter.c --- a/Modules/_tkinter.c Thu Aug 22 14:03:44 2013 +0100 +++ b/Modules/_tkinter.c Thu Aug 22 17:42:05 2013 +0300 @@ -1757,16 +1757,35 @@ char *list; int argc; char **argv; - PyObject *v; + PyObject *arg, *v; int i; - if (PyTuple_Size(args) == 1) { - v = PyTuple_GetItem(args, 0); - if (PyTuple_Check(v)) { - Py_INCREF(v); - return v; + if (!PyArg_ParseTuple(args, "O:splitlist", &arg)) + return NULL; + if (PyTclObject_Check(arg)) { + int objc; + Tcl_Obj **objv; + if (Tcl_ListObjGetElements(Tkapp_Interp(self), + ((PyTclObject*)arg)->value, + &objc, &objv) == TCL_ERROR) { + return Tkinter_Error(self); } + if (!(v = PyTuple_New(objc))) + return NULL; + for (i = 0; i < objc; i++) { + PyObject *s = FromObj(self, objv[i]); + if (!s || PyTuple_SetItem(v, i, s)) { + Py_DECREF(v); + return NULL; + } + } + return v; } + if (PyTuple_Check(arg)) { + Py_INCREF(arg); + return arg; + } + if (!PyArg_ParseTuple(args, "et:splitlist", "utf-8", &list)) return NULL; @@ -1797,16 +1816,38 @@ static PyObject * Tkapp_Split(PyObject *self, PyObject *args) { - PyObject *v; + PyObject *arg, *v; char *list; - if (PyTuple_Size(args) == 1) { - PyObject* o = PyTuple_GetItem(args, 0); - if (PyTuple_Check(o)) { - o = SplitObj(o); - return o; + if (!PyArg_ParseTuple(args, "O:split", &arg)) + return NULL; + if (PyTclObject_Check(arg)) { + Tcl_Obj *value = ((PyTclObject*)arg)->value; + int objc; + Tcl_Obj **objv; + int i; + if (Tcl_ListObjGetElements(Tkapp_Interp(self), value, + &objc, &objv) == TCL_ERROR) { + return FromObj(self, value); } + if (objc == 0) + return PyUnicode_FromString(""); + if (objc == 1) + return FromObj(self, objv[0]); + if (!(v = PyTuple_New(objc))) + return NULL; + for (i = 0; i < objc; i++) { + PyObject *s = FromObj(self, objv[i]); + if (!s || PyTuple_SetItem(v, i, s)) { + Py_DECREF(v); + return NULL; + } + } + return v; } + if (PyTuple_Check(arg)) + return SplitObj(arg); + if (!PyArg_ParseTuple(args, "et:split", "utf-8", &list)) return NULL; v = Split(list); /storchaka@gmail.com