mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A little reformating of Py3k warnings

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/arraymodule.c
View File

@ -1258,7 +1258,7 @@ static PyObject *
array_fromfile_as_read(arrayobject *self, PyObject *args)
{
if (PyErr_WarnPy3k("array.read() not supported in 3.x; "
"use array.fromfile()", 1) < 0)
"use array.fromfile()", 1) < 0)
return NULL;
return array_fromfile(self, args);
}
@ -1297,7 +1297,7 @@ static PyObject *
array_tofile_as_write(arrayobject *self, PyObject *f)
{
if (PyErr_WarnPy3k("array.write() not supported in 3.x; "
"use array.tofile()", 1) < 0)
"use array.tofile()", 1) < 0)
return NULL;
return array_tofile(self, f);
}

2
Objects/cellobject.c
View File

@ -56,7 +56,7 @@ cell_compare(PyCellObject *a, PyCellObject *b)
{
/* Py3K warning for comparisons */
if (PyErr_WarnPy3k("cell comparisons not supported in 3.x",
1) < 0) {
1) < 0) {
return -2;
}

4
Objects/codeobject.c
View File

@ -339,9 +339,9 @@ code_richcompare(PyObject *self, PyObject *other, int op)
!PyCode_Check(other)) {
/* Py3K warning if types are not equal and comparison
isn't == or != */
isn't == or != */
if (PyErr_WarnPy3k("code inequality comparisons not supported "
"in 3.x", 1) < 0) {
"in 3.x", 1) < 0) {
return NULL;
}

4
Objects/dictobject.c
View File

@ -1779,7 +1779,7 @@ dict_richcompare(PyObject *v, PyObject *w, int op)
else {
/* Py3K warning if comparison isn't == or != */
if (PyErr_WarnPy3k("dict inequality comparisons not supported "
"in 3.x", 1) < 0) {
"in 3.x", 1) < 0) {
return NULL;
}
res = Py_NotImplemented;
@ -1810,7 +1810,7 @@ static PyObject *
dict_has_key(register PyDictObject *mp, PyObject *key)
{
if (PyErr_WarnPy3k("dict.has_key() not supported in 3.x; "
"use the in operator", 1) < 0)
"use the in operator", 1) < 0)
return NULL;
return dict_contains(mp, key);
}

10
Objects/exceptions.c
View File

@ -279,9 +279,8 @@ BaseException_get_message(PyBaseExceptionObject *self)
int ret;
ret = PyErr_WarnEx(PyExc_DeprecationWarning,
"BaseException.message has been deprecated as "
"of Python 2.6",
1);
if (ret == -1)
"of Python 2.6", 1);
if (ret < 0)
return NULL;
Py_INCREF(self->message);
@ -294,9 +293,8 @@ BaseException_set_message(PyBaseExceptionObject *self, PyObject *val)
int ret;
ret = PyErr_WarnEx(PyExc_DeprecationWarning,
"BaseException.message has been deprecated as "
"of Python 2.6",
1);
if (ret == -1)
"of Python 2.6", 1);
if (ret < 0)
return -1;
Py_INCREF(val);
Py_DECREF(self->message);

5
Objects/fileobject.c
View File

@ -627,8 +627,9 @@ file_seek(PyFileObject *f, PyObject *args)
return NULL;
/* Deprecated in 2.6 */
PyErr_Clear();
if (PyErr_Warn(PyExc_DeprecationWarning,
"integer argument expected, got float"))
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"integer argument expected, got float",
1) < 0)
return NULL;
off_index = offobj;
Py_INCREF(offobj);

2
Objects/listobject.c
View File

@ -2038,7 +2038,7 @@ listsort(PyListObject *self, PyObject *args, PyObject *kwds)
if (compare == Py_None)
compare = NULL;
if (compare != NULL &&
PyErr_WarnPy3k("the cmp argument is not supported in 3.x", 1) < 0)
PyErr_WarnPy3k("the cmp argument is not supported in 3.x", 1) < 0)
return NULL;
if (keyfunc == Py_None)
keyfunc = NULL;

7
Objects/methodobject.c
View File

@ -236,7 +236,7 @@ meth_richcompare(PyObject *self, PyObject *other, int op)
{
/* Py3K warning if types are not equal and comparison isn't == or != */
if (PyErr_WarnPy3k("builtin_function_or_method inequality "
"comparisons not supported in 3.x", 1) < 0) {
"comparisons not supported in 3.x", 1) < 0) {
return NULL;
}
@ -352,9 +352,8 @@ Py_FindMethodInChain(PyMethodChain *chain, PyObject *self, const char *name)
{
if (name[0] == '_' && name[1] == '_') {
if (strcmp(name, "__methods__") == 0) {
if (Py_Py3kWarningFlag &&
PyErr_Warn(PyExc_DeprecationWarning,
"__methods__ not supported in 3.x") < 0)
if (PyErr_WarnPy3k("__methods__ not supported in 3.x",
1) < 0)
return NULL;
return listmethodchain(chain);
}

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