Commit 9e892bbf authored by Andrew Svetlov's avatar Andrew Svetlov

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

These functions are not documnted, so no documentation update.
parent 8613b0de
...@@ -37,6 +37,8 @@ Core and Builtins ...@@ -37,6 +37,8 @@ Core and Builtins
Library Library
------- -------
- Issue #5136: deprecated old, unused functions from tkinter.
- Issue #14409: IDLE now properly executes commands in the Shell window - Issue #14409: IDLE now properly executes commands in the Shell window
when it cannot read the normal config files on startup and when it cannot read the normal config files on startup and
has to use the built-in default key bindings. has to use the built-in default key bindings.
......
...@@ -1343,6 +1343,11 @@ Tkapp_GlobalCall(PyObject *self, PyObject *args) ...@@ -1343,6 +1343,11 @@ Tkapp_GlobalCall(PyObject *self, PyObject *args)
char *cmd; char *cmd;
PyObject *res = NULL; 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; CHECK_TCL_APPARTMENT;
cmd = Merge(args); cmd = Merge(args);
...@@ -1392,6 +1397,11 @@ Tkapp_GlobalEval(PyObject *self, PyObject *args) ...@@ -1392,6 +1397,11 @@ Tkapp_GlobalEval(PyObject *self, PyObject *args)
PyObject *res = NULL; PyObject *res = NULL;
int err; 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)) if (!PyArg_ParseTuple(args, "s:globaleval", &script))
return NULL; return NULL;
...@@ -1954,9 +1964,16 @@ Tkapp_Split(PyObject *self, PyObject *args) ...@@ -1954,9 +1964,16 @@ Tkapp_Split(PyObject *self, PyObject *args)
static PyObject * static PyObject *
Tkapp_Merge(PyObject *self, PyObject *args) Tkapp_Merge(PyObject *self, PyObject *args)
{ {
char *s = Merge(args); char *s;
PyObject *res = NULL; 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) { if (s) {
res = PyUnicode_FromString(s); res = PyUnicode_FromString(s);
ckfree(s); ckfree(s);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment