diff options
| author | Victor Stinner <vstinner@python.org> | 2021-10-18 23:31:57 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-18 23:31:57 (GMT) |
| commit | aad88d33d9db0a93e480f0234292b948890dfc2a (patch) | |
| tree | 9a7be9c98f0c6a4d64ddda7859922b394ed3cdc3 /Include/warnings.h | |
| parent | 4d03de3329ed8daa9c1107b1aedbb0fa280bddb6 (diff) | |
| download | cpython-aad88d33d9db0a93e480f0234292b948890dfc2a.zip cpython-aad88d33d9db0a93e480f0234292b948890dfc2a.tar.gz cpython-aad88d33d9db0a93e480f0234292b948890dfc2a.tar.bz2 | |
bpo-35134: Split warnings.h and weakrefobject.h (GH-29042)
Split header files to move the non-limited API to Include/cpython/:
* Include/warnings.h => Include/cpython/warnings.h
* Include/weakrefobject.h => Include/cpython/weakrefobject.h
Exclude PyWeakref_GET_OBJECT() from the limited C API. It never
worked since the PyWeakReference structure is opaque in the limited C
API.
Move _PyWarnings_Init() and _PyErr_WarnUnawaitedCoroutine() to the
internal C API.
Diffstat (limited to 'Include/warnings.h')
| -rw-r--r-- | Include/warnings.h | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/Include/warnings.h b/Include/warnings.h index a675bb5..18ac154 100644 --- a/Include/warnings.h +++ b/Include/warnings.h @@ -4,14 +4,11 @@ extern "C" { #endif -#ifndef Py_LIMITED_API -PyAPI_FUNC(PyObject*) _PyWarnings_Init(void); -#endif - PyAPI_FUNC(int) PyErr_WarnEx( PyObject *category, const char *message, /* UTF-8 encoded string */ Py_ssize_t stack_level); + PyAPI_FUNC(int) PyErr_WarnFormat( PyObject *category, Py_ssize_t stack_level, @@ -26,15 +23,7 @@ PyAPI_FUNC(int) PyErr_ResourceWarning( const char *format, /* ASCII-encoded string */ ...); #endif -#ifndef Py_LIMITED_API -PyAPI_FUNC(int) PyErr_WarnExplicitObject( - PyObject *category, - PyObject *message, - PyObject *filename, - int lineno, - PyObject *module, - PyObject *registry); -#endif + PyAPI_FUNC(int) PyErr_WarnExplicit( PyObject *category, const char *message, /* UTF-8 encoded string */ @@ -44,20 +33,9 @@ PyAPI_FUNC(int) PyErr_WarnExplicit( PyObject *registry); #ifndef Py_LIMITED_API -PyAPI_FUNC(int) -PyErr_WarnExplicitFormat(PyObject *category, - const char *filename, int lineno, - const char *module, PyObject *registry, - const char *format, ...); -#endif - -/* DEPRECATED: Use PyErr_WarnEx() instead. */ -#ifndef Py_LIMITED_API -#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1) -#endif - -#ifndef Py_LIMITED_API -void _PyErr_WarnUnawaitedCoroutine(PyObject *coro); +# define Py_CPYTHON_WARNINGS_H +# include "cpython/warnings.h" +# undef Py_CPYTHON_WARNINGS_H #endif #ifdef __cplusplus |