summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-11-06 13:20:12 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-11-06 13:20:12 (GMT)
commita5ae1f0c25212a48dc839de86d9f29312f6c0a3a (patch)
tree1540948ad6fd8551e1f7be62ba5d96db06d7a923
parent819d8d447da7e2a8530574af2a7574fdc011b0c2 (diff)
downloadcpython-a5ae1f0c25212a48dc839de86d9f29312f6c0a3a.zip
cpython-a5ae1f0c25212a48dc839de86d9f29312f6c0a3a.tar.gz
cpython-a5ae1f0c25212a48dc839de86d9f29312f6c0a3a.tar.bz2
remove py3k warning for callable
-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 2f7b54e..9911360 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 a9a7ad1..c25588a 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));
}