summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS2
-rw-r--r--Python/bltinmodule.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2f7b54e4e5..9911360973 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,8 @@ What's New in Python 2.7.3?
Core and Builtins
-----------------
+- Remove Py3k warning for callable.
+
- Issue #13340: Accept None as start and stop parameters for
list.index() and tuple.index().
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index a9a7ad1009..c25588a45e 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -224,9 +224,6 @@ Return the binary representation of an integer or long integer.");
static PyObject *
builtin_callable(PyObject *self, PyObject *v)
{
- if (PyErr_WarnPy3k("callable() not supported in 3.1; "
- "use isinstance(x, collections.Callable)", 1) < 0)
- return NULL;
return PyBool_FromLong((long)PyCallable_Check(v));
}