traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove py3k warning for callable

This commit is contained in:
Benjamin Peterson 2011-11-06 08:20:12 -05:00
parent 819d8d447d
commit a5ae1f0c25
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -9,6 +9,8 @@ What's New in Python 2.7.3?
Core and Builtins Core and Builtins
----------------- -----------------
- Remove Py3k warning for callable.
- Issue #13340: Accept None as start and stop parameters for - Issue #13340: Accept None as start and stop parameters for
list.index() and tuple.index(). list.index() and tuple.index().

3
Python/bltinmodule.c
View File

@ -224,9 +224,6 @@ Return the binary representation of an integer or long integer.");
static PyObject * static PyObject *
builtin_callable(PyObject *self, PyObject *v) 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)); return PyBool_FromLong((long)PyCallable_Check(v));
} }