[Python-checkins] r63704 - in python/trunk: Include/warnings.h Misc/NEWS Python/_warnings.c
benjamin.peterson
python-checkins at python.org
Mon May 26 19:43:53 CEST 2008
Author: benjamin.peterson
Date: Mon May 26 19:43:53 2008
New Revision: 63704
Log:
turn PyErr_WarnPy3k into a macro
Modified:
python/trunk/Include/warnings.h
python/trunk/Misc/NEWS
python/trunk/Python/_warnings.c
Modified: python/trunk/Include/warnings.h
==============================================================================
--- python/trunk/Include/warnings.h (original)
+++ python/trunk/Include/warnings.h Mon May 26 19:43:53 2008
@@ -9,7 +9,8 @@
PyAPI_FUNC(int) PyErr_WarnEx(PyObject *, const char *, Py_ssize_t);
PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *, const char *, int,
const char *, PyObject *);
-PyAPI_FUNC(int) PyErr_WarnPy3k(const char *, Py_ssize_t);
+
+#define PyErr_WarnPy3k(msg, stacklevel) (Py_Py3kWarningFlag ? PyErr_WarnEx(PyExc_DeprecationWarning, msg, stacklevel) : 0)
/* DEPRECATED: Use PyErr_WarnEx() instead. */
#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1)
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Mon May 26 19:43:53 2008
@@ -409,8 +409,7 @@
which provide the functions through their libm. The files also
contains several helpers and constants for math.
-- Added a new convenience function, PyErr_WarnPy3k, for issuing Py3k
- warnings.
+- Added a new convenience macro, PyErr_WarnPy3k, for issuing Py3k warnings.
What's New in Python 2.6 alpha 2?
Modified: python/trunk/Python/_warnings.c
==============================================================================
--- python/trunk/Python/_warnings.c (original)
+++ python/trunk/Python/_warnings.c Mon May 26 19:43:53 2008
@@ -775,15 +775,6 @@
}
-int
-PyErr_WarnPy3k(const char *text, Py_ssize_t stacklevel)
-{
- if (Py_Py3kWarningFlag)
- return PyErr_WarnEx(PyExc_DeprecationWarning, text, stacklevel);
- return 0;
-}
-
-
PyDoc_STRVAR(warn_doc,
"Issue a warning, or maybe ignore it or raise an exception.");
More information about the Python-checkins
mailing list