fix issue #5136: deprecate old unused functions from tkinter.

These functions are not documnted, so no documentation update.
This commit is contained in:
Andrew Svetlov 2012-03-31 19:36:39 +03:00
parent 8613b0dea4
commit 9e892bbf28
2 changed files with 20 additions and 1 deletions

View File

@ -37,6 +37,8 @@ Core and Builtins
Library
-------
- Issue #5136: deprecated old, unused functions from tkinter.
- Issue #14409: IDLE now properly executes commands in the Shell window
when it cannot read the normal config files on startup and
has to use the built-in default key bindings.

View File

@ -1343,6 +1343,11 @@ Tkapp_GlobalCall(PyObject *self, PyObject *args)
char *cmd;
PyObject *res = NULL;
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"globalcall is deprecated and will be removed in 3.4",
1) < 0)
return 0;
CHECK_TCL_APPARTMENT;
cmd = Merge(args);
@ -1392,6 +1397,11 @@ Tkapp_GlobalEval(PyObject *self, PyObject *args)
PyObject *res = NULL;
int err;
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"globaleval is deprecated and will be removed in 3.4",
1) < 0)
return 0;
if (!PyArg_ParseTuple(args, "s:globaleval", &script))
return NULL;
@ -1954,9 +1964,16 @@ Tkapp_Split(PyObject *self, PyObject *args)
static PyObject *
Tkapp_Merge(PyObject *self, PyObject *args)
{
char *s = Merge(args);
char *s;
PyObject *res = NULL;
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"merge is deprecated and will be removed in 3.4",
1) < 0)
return 0;
s = Merge(args);
if (s) {
res = PyUnicode_FromString(s);
ckfree(s);