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

turn PyErr_WarnPy3k into a macro

Browse source
This commit is contained in:
Benjamin Peterson 2008-05-26 17:43:53 +00:00
parent eeb2b21ab0
commit dacde0d6ae
3 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Include/warnings.h
View file

@ -9,7 +9,8 @@ PyAPI_FUNC(void) _PyWarnings_Init(void);
PyAPI_FUNC(int) PyErr_WarnEx(PyObject *, const char *, Py_ssize_t); PyAPI_FUNC(int) PyErr_WarnEx(PyObject *, const char *, Py_ssize_t);
PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *, const char *, int, PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *, const char *, int,
const char *, PyObject *); 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. */ /* DEPRECATED: Use PyErr_WarnEx() instead. */
#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1) #define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1)

3
Misc/NEWS
View file

@ -409,8 +409,7 @@ C API
which provide the functions through their libm. The files also which provide the functions through their libm. The files also
contains several helpers and constants for math. contains several helpers and constants for math.
- Added a new convenience function, PyErr_WarnPy3k, for issuing Py3k - Added a new convenience macro, PyErr_WarnPy3k, for issuing Py3k warnings.
warnings.
What's New in Python 2.6 alpha 2? What's New in Python 2.6 alpha 2?

9
Python/_warnings.c
View file

@ -775,15 +775,6 @@ PyErr_WarnExplicit(PyObject *category, const char *text,
} }
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, PyDoc_STRVAR(warn_doc,
"Issue a warning, or maybe ignore it or raise an exception."); "Issue a warning, or maybe ignore it or raise an exception.");