From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 24 Feb 2008 02:40:58 +0000 (+0000)
Subject: Add a little info to the 3k deprecation warnings about what to use instead.
X-Git-Tag: v2.6a1~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b93e7d16d50a6055309d9ff4e105ade453079c41;p=python

Add a little info to the 3k deprecation warnings about what to use instead.
Suggested by Raymond Hettinger.
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 648637df51..fe5cb42cca 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -166,7 +166,7 @@ builtin_apply(PyObject *self, PyObject *args)
 
 	if (Py_Py3kWarningFlag &&
 	    PyErr_Warn(PyExc_DeprecationWarning, 
-		       "apply() not supported in 3.x") < 0)
+		       "apply() not supported in 3.x. Use func(*args, **kwargs).") < 0)
 		return NULL;
 
 	if (!PyArg_UnpackTuple(args, "apply", 1, 3, &func, &alist, &kwdict))
@@ -225,7 +225,7 @@ builtin_callable(PyObject *self, PyObject *v)
 {
 	if (Py_Py3kWarningFlag &&
 	    PyErr_Warn(PyExc_DeprecationWarning, 
-		       "callable() not supported in 3.x") < 0)
+		       "callable() not supported in 3.x. Use hasattr(o, '__call__').") < 0)
 		return NULL;
 	return PyBool_FromLong((long)PyCallable_Check(v));
 }
@@ -684,7 +684,7 @@ builtin_execfile(PyObject *self, PyObject *args)
 
 	if (Py_Py3kWarningFlag &&
 	    PyErr_Warn(PyExc_DeprecationWarning, 
-		       "execfile() not supported in 3.x") < 0)
+		       "execfile() not supported in 3.x.  Use exec().") < 0)
 		return NULL;
 
 	if (!PyArg_ParseTuple(args, "s|O!O:execfile",
@@ -912,7 +912,7 @@ builtin_map(PyObject *self, PyObject *args)
 	if (func == Py_None) {
 		if (Py_Py3kWarningFlag &&
 		    PyErr_Warn(PyExc_DeprecationWarning, 
-			       "map(None, ...) not supported in 3.x") < 0)
+			       "map(None, ...) not supported in 3.x. Use list(...).") < 0)
 			return NULL;
 		if (n == 1) {
 			/* map(None, S) is the same as list(S). */