summaryrefslogtreecommitdiffstats
path: root/Modules/_tkinter.c
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2005-03-08 15:03:08 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2005-03-08 15:03:08 (GMT)
commite2713becd8cb0c3b2db4d33832dd57a1d619f0f3 (patch)
treec46d31f73c95c9a969b6704719dac3e83eb435f1 /Modules/_tkinter.c
parentb60ae9960182b8eecb26da12171917ee5a6cc1fc (diff)
downloadcpython-e2713becd8cb0c3b2db4d33832dd57a1d619f0f3.zip
cpython-e2713becd8cb0c3b2db4d33832dd57a1d619f0f3.tar.gz
cpython-e2713becd8cb0c3b2db4d33832dd57a1d619f0f3.tar.bz2
Build with --disable-unicode again. Fixes #1158607.
Will backport to 2.4.
Diffstat (limited to 'Modules/_tkinter.c')
-rw-r--r--Modules/_tkinter.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 76c2a44..632f3d6 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -838,8 +838,10 @@ static PyGetSetDef PyTclObject_getsetlist[] = {
};
static PyMethodDef PyTclObject_methods[] = {
+#ifdef Py_USING_UNICODE
{"__unicode__", (PyCFunction)PyTclObject_unicode, METH_NOARGS,
PyTclObject_unicode__doc__},
+#endif
{0}
};
@@ -991,7 +993,7 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
}
}
#else
- res = PyString_FromStringAndSize(value->bytes, value->length);
+ result = PyString_FromStringAndSize(value->bytes, value->length);
#endif
return result;
}