mirror of https://github.com/python/cpython
gh-108494: Fix Argument Clinic LIMITED_CAPI_REGEX (#116610)
Accept spaces in "# define Py_LIMITED_API 0x030d0000".
This commit is contained in:
parent
06e29a224f
commit
2b67fc57f6
|
@ -1,8 +1,7 @@
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
|
||||||
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
||||||
#define Py_LIMITED_API 0x030c0000
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
#ifndef Py_GIL_DISABLED
|
||||||
|
# define Py_LIMITED_API 0x030c0000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// gh-85283: On Windows, Py_LIMITED_API requires Py_BUILD_CORE to not attempt
|
// gh-85283: On Windows, Py_LIMITED_API requires Py_BUILD_CORE to not attempt
|
||||||
|
|
|
@ -2,11 +2,10 @@
|
||||||
posixshmem - A Python extension that provides shm_open() and shm_unlink()
|
posixshmem - A Python extension that provides shm_open() and shm_unlink()
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
|
||||||
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
||||||
#define Py_LIMITED_API 0x030c0000
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
#ifndef Py_GIL_DISABLED
|
||||||
|
# define Py_LIMITED_API 0x030c0000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Python.h>
|
#include <Python.h>
|
||||||
|
|
|
@ -3,11 +3,10 @@
|
||||||
* using the SystemConfiguration framework.
|
* using the SystemConfiguration framework.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
|
||||||
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
||||||
#define Py_LIMITED_API 0x030c0000
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
#ifndef Py_GIL_DISABLED
|
||||||
|
# define Py_LIMITED_API 0x030c0000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Python.h>
|
#include <Python.h>
|
||||||
|
|
|
@ -11,11 +11,10 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
|
||||||
// Need limited C API version 3.13 for PyModule_Add() on Windows
|
// Need limited C API version 3.13 for PyModule_Add() on Windows
|
||||||
#define Py_LIMITED_API 0x030d0000
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
#ifndef Py_GIL_DISABLED
|
||||||
|
# define Py_LIMITED_API 0x030d0000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
|
|
|
@ -4,11 +4,10 @@
|
||||||
#undef Py_BUILD_CORE_MODULE
|
#undef Py_BUILD_CORE_MODULE
|
||||||
#undef Py_BUILD_CORE_BUILTIN
|
#undef Py_BUILD_CORE_BUILTIN
|
||||||
|
|
||||||
|
// For now, AC only supports the limited C API version 3.13
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
#ifndef Py_GIL_DISABLED
|
||||||
// For now, only limited C API 3.13 is supported
|
# define Py_LIMITED_API 0x030d0000
|
||||||
#define Py_LIMITED_API 0x030d0000
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Always enable assertions */
|
/* Always enable assertions */
|
||||||
|
|
|
@ -5,9 +5,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
#ifndef Py_GIL_DISABLED
|
||||||
#define Py_LIMITED_API 0x03020000
|
# define Py_LIMITED_API 0x03020000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Python.h>
|
#include <Python.h>
|
||||||
|
|
|
@ -3,11 +3,10 @@
|
||||||
* DCE compatible Universally Unique Identifier library.
|
* DCE compatible Universally Unique Identifier library.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
|
||||||
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
||||||
#define Py_LIMITED_API 0x030c0000
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
#ifndef Py_GIL_DISABLED
|
||||||
|
# define Py_LIMITED_API 0x030c0000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
/* Errno module */
|
/* Errno module */
|
||||||
|
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
|
||||||
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
||||||
#define Py_LIMITED_API 0x030c0000
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
#ifndef Py_GIL_DISABLED
|
||||||
|
# define Py_LIMITED_API 0x030c0000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
|
||||||
// Need limited C API version 3.13 for PySys_Audit()
|
// Need limited C API version 3.13 for PySys_Audit()
|
||||||
#define Py_LIMITED_API 0x030d0000
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
#ifndef Py_GIL_DISABLED
|
||||||
|
# define Py_LIMITED_API 0x030d0000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
|
|
|
@ -62,11 +62,10 @@
|
||||||
pass
|
pass
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
|
||||||
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
||||||
#define Py_LIMITED_API 0x030c0000
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
#ifndef Py_GIL_DISABLED
|
||||||
|
# define Py_LIMITED_API 0x030c0000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
* See the xxlimited module for an extension module template.
|
* See the xxlimited module for an extension module template.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// Test the limited C API version 3.5
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
#ifndef Py_GIL_DISABLED
|
||||||
#define Py_LIMITED_API 0x03050000
|
# define Py_LIMITED_API 0x03050000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
|
|
|
@ -35,11 +35,10 @@
|
||||||
winsound.PlaySound(None, 0)
|
winsound.PlaySound(None, 0)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "pyconfig.h" // Py_GIL_DISABLED
|
|
||||||
|
|
||||||
#ifndef Py_GIL_DISABLED
|
|
||||||
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
// Need limited C API version 3.12 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
|
||||||
#define Py_LIMITED_API 0x030c0000
|
#include "pyconfig.h" // Py_GIL_DISABLED
|
||||||
|
#ifndef Py_GIL_DISABLED
|
||||||
|
# define Py_LIMITED_API 0x030c0000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Python.h>
|
#include <Python.h>
|
||||||
|
|
|
@ -66,8 +66,9 @@ from libclinic import ClinicError
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
# match '#define Py_LIMITED_API'
|
# Match '#define Py_LIMITED_API'.
|
||||||
LIMITED_CAPI_REGEX = re.compile(r'#define +Py_LIMITED_API')
|
# Match '# define Py_LIMITED_API 0x030d0000' (without the version).
|
||||||
|
LIMITED_CAPI_REGEX = re.compile(r'# *define +Py_LIMITED_API')
|
||||||
|
|
||||||
|
|
||||||
class Sentinels(enum.Enum):
|
class Sentinels(enum.Enum):
|
||||||
|
|
Loading…
Reference in New Issue