[Python-checkins] r62536 - in python/trunk: Modules/arraymodule.c Objects/cellobject.c Objects/codeobject.c Objects/dictobject.c Objects/exceptions.c Objects/fileobject.c Objects/listobject.c Objects/methodobject.c Python/bltinmodule.c Python/ceval.c Python/sysmodule.c
benjamin.peterson
python-checkins at python.org
Sun Apr 27 20:40:22 CEST 2008
Author: benjamin.peterson
Date: Sun Apr 27 20:40:21 2008
New Revision: 62536
Log:
A little reformating of Py3k warnings
Modified:
python/trunk/Modules/arraymodule.c
python/trunk/Objects/cellobject.c
python/trunk/Objects/codeobject.c
python/trunk/Objects/dictobject.c
python/trunk/Objects/exceptions.c
python/trunk/Objects/fileobject.c
python/trunk/Objects/listobject.c
python/trunk/Objects/methodobject.c
python/trunk/Python/bltinmodule.c
python/trunk/Python/ceval.c
python/trunk/Python/sysmodule.c
Modified: python/trunk/Modules/arraymodule.c
==============================================================================
--- python/trunk/Modules/arraymodule.c (original)
+++ python/trunk/Modules/arraymodule.c Sun Apr 27 20:40:21 2008
@@ -1258,7 +1258,7 @@
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 @@
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);
}
Modified: python/trunk/Objects/cellobject.c
==============================================================================
--- python/trunk/Objects/cellobject.c (original)
+++ python/trunk/Objects/cellobject.c Sun Apr 27 20:40:21 2008
@@ -56,7 +56,7 @@
{
/* Py3K warning for comparisons */
if (PyErr_WarnPy3k("cell comparisons not supported in 3.x",
- 1) < 0) {
+ 1) < 0) {
return -2;
}
Modified: python/trunk/Objects/codeobject.c
==============================================================================
--- python/trunk/Objects/codeobject.c (original)
+++ python/trunk/Objects/codeobject.c Sun Apr 27 20:40:21 2008
@@ -339,9 +339,9 @@
!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;
}
Modified: python/trunk/Objects/dictobject.c
==============================================================================
--- python/trunk/Objects/dictobject.c (original)
+++ python/trunk/Objects/dictobject.c Sun Apr 27 20:40:21 2008
@@ -1779,7 +1779,7 @@
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 @@
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);
}
Modified: python/trunk/Objects/exceptions.c
==============================================================================
--- python/trunk/Objects/exceptions.c (original)
+++ python/trunk/Objects/exceptions.c Sun Apr 27 20:40:21 2008
@@ -279,9 +279,8 @@
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 @@
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);
Modified: python/trunk/Objects/fileobject.c
==============================================================================
--- python/trunk/Objects/fileobject.c (original)
+++ python/trunk/Objects/fileobject.c Sun Apr 27 20:40:21 2008
@@ -627,8 +627,9 @@
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);
Modified: python/trunk/Objects/listobject.c
==============================================================================
--- python/trunk/Objects/listobject.c (original)
+++ python/trunk/Objects/listobject.c Sun Apr 27 20:40:21 2008
@@ -2038,7 +2038,7 @@
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;
Modified: python/trunk/Objects/methodobject.c
==============================================================================
--- python/trunk/Objects/methodobject.c (original)
+++ python/trunk/Objects/methodobject.c Sun Apr 27 20:40:21 2008
@@ -236,7 +236,7 @@
{
/* 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 @@
{
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);
}
Modified: python/trunk/Python/bltinmodule.c
==============================================================================
--- python/trunk/Python/bltinmodule.c (original)
+++ python/trunk/Python/bltinmodule.c Sun Apr 27 20:40:21 2008
@@ -166,7 +166,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
Modified: python/trunk/Python/ceval.c
==============================================================================
--- python/trunk/Python/ceval.c (original)
+++ python/trunk/Python/ceval.c Sun Apr 27 20:40:21 2008
@@ -3157,16 +3157,16 @@
/* 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 @@
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 @@
ret_val = PyErr_WarnEx(
PyExc_DeprecationWarning,
CANNOT_CATCH_MSG, 1);
- if (ret_val == -1)
+ if (ret_val < 0)
return NULL;
}
}
@@ -4115,7 +4115,7 @@
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 @@
ret_val = PyErr_WarnEx(
PyExc_DeprecationWarning,
CANNOT_CATCH_MSG, 1);
- if (ret_val == -1)
+ if (ret_val < 0)
return NULL;
}
}
Modified: python/trunk/Python/sysmodule.c
==============================================================================
--- python/trunk/Python/sysmodule.c (original)
+++ python/trunk/Python/sysmodule.c Sun Apr 27 20:40:21 2008
@@ -173,7 +173,7 @@
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();
More information about the Python-checkins
mailing list