mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 05:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

A little reformating of Py3k warnings

Browse source
This commit is contained in:
Benjamin Peterson 2008-04-27 18:40:21 +00:00
parent fe4948bcef
commit f19a7b90bd
11 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/bltinmodule.c
View file

@ -166,7 +166,7 @@ builtin_apply(PyObject *self, PyObject *args)
PyObject *t = NULL, *retval = NULL;
if (PyErr_WarnPy3k("apply() not supported in 3.x; "
"use func(*args, **kwargs)", 1) < 0)
"use func(*args, **kwargs)", 1) < 0)
return NULL;
if (!PyArg_UnpackTuple(args, "apply", 1, 3, &func, &alist, &kwdict))
@ -224,7 +224,7 @@ static PyObject *
builtin_callable(PyObject *self, PyObject *v)
{
if (PyErr_WarnPy3k("callable() not supported in 3.x; "
"use hasattr(o, '__call__')", 1) < 0)
"use hasattr(o, '__call__')", 1) < 0)
return NULL;
return PyBool_FromLong((long)PyCallable_Check(v));
}
@ -704,7 +704,7 @@ builtin_execfile(PyObject *self, PyObject *args)
int exists;
if (PyErr_WarnPy3k("execfile() not supported in 3.x; use exec()",
1) < 0)
1) < 0)
return NULL;
if (!PyArg_ParseTuple(args, "s|O!O:execfile",
@ -931,7 +931,7 @@ builtin_map(PyObject *self, PyObject *args)
if (func == Py_None) {
if (PyErr_WarnPy3k("map(None, ...) not supported in 3.x; "
"use list(...)", 1) < 0)
"use list(...)", 1) < 0)
return NULL;
if (n == 1) {
/* map(None, S) is the same as list(S). */
@ -1959,7 +1959,7 @@ builtin_reduce(PyObject *self, PyObject *args)
PyObject *seq, *func, *result = NULL, *it;
if (PyErr_WarnPy3k("reduce() not supported in 3.x; "
"use functools.reduce()", 1) < 0)
"use functools.reduce()", 1) < 0)
return NULL;
if (!PyArg_UnpackTuple(args, "reduce", 2, 3, &func, &seq, &result))
@ -2035,7 +2035,7 @@ static PyObject *
builtin_reload(PyObject *self, PyObject *v)
{
if (PyErr_WarnPy3k("In 3.x, reload() is renamed to imp.reload()",
1) < 0)
1) < 0)
return NULL;
return PyImport_ReloadModule(v);

16
Python/ceval.c
View file

@ -3157,16 +3157,16 @@ do_raise(PyObject *type, PyObject *value, PyObject *tb)
/* Not something you can raise. You get an exception
anyway, just not what you specified :-) */
PyErr_Format(PyExc_TypeError,
"exceptions must be classes or instances, not %s",
type->ob_type->tp_name);
"exceptions must be classes or instances, not %s",
type->ob_type->tp_name);
goto raise_error;
}
assert(PyExceptionClass_Check(type));
if (Py_Py3kWarningFlag && PyClass_Check(type)) {
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"exceptions must derive from BaseException "
"in 3.x", 1) == -1)
"exceptions must derive from BaseException "
"in 3.x", 1) < 0)
goto raise_error;
}
@ -4092,7 +4092,7 @@ cmp_outcome(int op, register PyObject *v, register PyObject *w)
PyExc_DeprecationWarning,
"catching of string "
"exceptions is deprecated", 1);
if (ret_val == -1)
if (ret_val < 0)
return NULL;
}
else if (Py_Py3kWarningFlag &&
@ -4103,7 +4103,7 @@ cmp_outcome(int op, register PyObject *v, register PyObject *w)
ret_val = PyErr_WarnEx(
PyExc_DeprecationWarning,
CANNOT_CATCH_MSG, 1);
if (ret_val == -1)
if (ret_val < 0)
return NULL;
}
}
@ -4115,7 +4115,7 @@ cmp_outcome(int op, register PyObject *v, register PyObject *w)
PyExc_DeprecationWarning,
"catching of string "
"exceptions is deprecated", 1);
if (ret_val == -1)
if (ret_val < 0)
return NULL;
}
else if (Py_Py3kWarningFlag &&
@ -4126,7 +4126,7 @@ cmp_outcome(int op, register PyObject *v, register PyObject *w)
ret_val = PyErr_WarnEx(
PyExc_DeprecationWarning,
CANNOT_CATCH_MSG, 1);
if (ret_val == -1)
if (ret_val < 0)
return NULL;
}
}

2
Python/sysmodule.c
View file

@ -173,7 +173,7 @@ sys_exc_clear(PyObject *self, PyObject *noargs)
PyObject *tmp_type, *tmp_value, *tmp_tb;
if (PyErr_WarnPy3k("sys.exc_clear() not supported in 3.x; "
"use except clauses", 1) < 0)
"use except clauses", 1) < 0)
return NULL;
tstate = PyThreadState_GET();