traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert tcl objects to strings in getvar/setvar. Fixes #730506.

This commit is contained in:
Martin v. Löwis 2003-05-01 05:47:00 +00:00
parent 9e29625a1b
commit 1869ec5cb7
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Modules/_tkinter.c
View File

@ -742,6 +742,12 @@ PyTclObject_str(PyTclObject *self)
return PyString_FromString(Tcl_GetString(self->value)); return PyString_FromString(Tcl_GetString(self->value));
} }
static char*
PyTclObject_TclString(PyObject *self)
{
return Tcl_GetString(((PyTclObject*)self)->value);
}
/* Like _str, but create Unicode if necessary. */ /* Like _str, but create Unicode if necessary. */
PyDoc_STRVAR(PyTclObject_string__doc__, PyDoc_STRVAR(PyTclObject_string__doc__,
"the string representation of this object, either as string or Unicode"); "the string representation of this object, either as string or Unicode");
@ -1466,6 +1472,22 @@ typedef struct VarEvent {
Tcl_Condition cond; Tcl_Condition cond;
} VarEvent; } VarEvent;
static int
varname_converter(PyObject *in, void *_out)
{
char **out = (char**)_out;
if (PyString_Check(in)) {
*out = PyString_AsString(in);
return 1;
}
if (PyTclObject_Check(in)) {
*out = PyTclObject_TclString(in);
return 1;
}
/* XXX: Should give diagnostics. */
return 0;
}
void void
var_perform(VarEvent *ev) var_perform(VarEvent *ev)
{ {
@ -1542,7 +1564,8 @@ SetVar(PyObject *self, PyObject *args, int flags)
PyObject *res = NULL; PyObject *res = NULL;
Tcl_Obj *newval, *ok; Tcl_Obj *newval, *ok;
if (PyArg_ParseTuple(args, "sO:setvar", &name1, &newValue)) { if (PyArg_ParseTuple(args, "O&O:setvar",
varname_converter, &name1, &newValue)) {
/* XXX Acquire tcl lock??? */ /* XXX Acquire tcl lock??? */
newval = AsObj(newValue); newval = AsObj(newValue);
if (newval == NULL) if (newval == NULL)
@ -1604,7 +1627,8 @@ GetVar(PyObject *self, PyObject *args, int flags)
PyObject *res = NULL; PyObject *res = NULL;
Tcl_Obj *tres; Tcl_Obj *tres;
if (!PyArg_ParseTuple(args, "s|s:getvar", &name1, &name2)) if (!PyArg_ParseTuple(args, "O&|s:getvar",
varname_converter, &name1, &name2))
return NULL; return NULL;
ENTER_TCL ENTER_TCL