From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 6 Nov 2011 13:20:12 +0000 (-0500)
Subject: remove py3k warning for callable
X-Git-Tag: v2.7.3rc1~323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5ae1f0c25212a48dc839de86d9f29312f6c0a3a;p=python

remove py3k warning for callable
---

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));
 }