diff --git a/Include/boolobject.h b/Include/boolobject.h index 013c35a..d87603e 100644 --- a/Include/boolobject.h +++ b/Include/boolobject.h @@ -38,11 +38,11 @@ PyAPI_FUNC(int) Ty_IsFalse(TyObject *x); * Only treat Ty_True and Ty_False as immortal in the limited C API 3.12 * and newer. */ #if defined(Ty_LIMITED_API) && Ty_LIMITED_API+0 < 0x030c0000 -# define Ty_RETURN_TRUE return Ty_NewRef(Ty_True) -# define Ty_RETURN_FALSE return Ty_NewRef(Ty_False) +# define Py_RETURN_TRUE return Ty_NewRef(Ty_True) +# define Py_RETURN_FALSE return Ty_NewRef(Ty_False) #else -# define Ty_RETURN_TRUE return Ty_True -# define Ty_RETURN_FALSE return Ty_False +# define Py_RETURN_TRUE return Ty_True +# define Py_RETURN_FALSE return Ty_False #endif /* Function to return a bool from a C long */ diff --git a/Include/cpython/abstract.h b/Include/cpython/abstract.h index af69b95..a9bf0a3 100644 --- a/Include/cpython/abstract.h +++ b/Include/cpython/abstract.h @@ -62,7 +62,7 @@ static inline TyObject * PyObject_CallMethodNoArgs(TyObject *self, TyObject *name) { size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET; - return PyObject_VectorcallMethod(name, &self, nargsf, _Ty_NULL); + return PyObject_VectorcallMethod(name, &self, nargsf, _Py_NULL); } static inline TyObject * @@ -71,7 +71,7 @@ PyObject_CallMethodOneArg(TyObject *self, TyObject *name, TyObject *arg) TyObject *args[2] = {self, arg}; size_t nargsf = 2 | PY_VECTORCALL_ARGUMENTS_OFFSET; assert(arg != NULL); - return PyObject_VectorcallMethod(name, args, nargsf, _Ty_NULL); + return PyObject_VectorcallMethod(name, args, nargsf, _Py_NULL); } /* Guess the size of object 'o' using len(o) or o.__length_hint__(). diff --git a/Include/cpython/bytearrayobject.h b/Include/cpython/bytearrayobject.h index e0c02c1..7ad8ffc 100644 --- a/Include/cpython/bytearrayobject.h +++ b/Include/cpython/bytearrayobject.h @@ -15,7 +15,7 @@ PyAPI_DATA(char) _PyByteArray_empty_string[]; /* Macros and static inline functions, trading safety for speed */ #define _PyByteArray_CAST(op) \ - (assert(TyByteArray_Check(op)), _Ty_CAST(PyByteArrayObject*, op)) + (assert(TyByteArray_Check(op)), _Py_CAST(PyByteArrayObject*, op)) static inline char* TyByteArray_AS_STRING(TyObject *op) { diff --git a/Include/cpython/bytesobject.h b/Include/cpython/bytesobject.h index 9009f35..4f4186f 100644 --- a/Include/cpython/bytesobject.h +++ b/Include/cpython/bytesobject.h @@ -18,7 +18,7 @@ PyAPI_FUNC(int) _TyBytes_Resize(TyObject **, Ty_ssize_t); /* Macros and static inline functions, trading safety for speed */ #define _TyBytes_CAST(op) \ - (assert(TyBytes_Check(op)), _Ty_CAST(PyBytesObject*, op)) + (assert(TyBytes_Check(op)), _Py_CAST(PyBytesObject*, op)) static inline char* TyBytes_AS_STRING(TyObject *op) { diff --git a/Include/cpython/cellobject.h b/Include/cpython/cellobject.h index 385602b..b9ee547 100644 --- a/Include/cpython/cellobject.h +++ b/Include/cpython/cellobject.h @@ -25,7 +25,7 @@ static inline TyObject* TyCell_GET(TyObject *op) { TyObject *res; PyCellObject *cell; assert(TyCell_Check(op)); - cell = _Ty_CAST(PyCellObject*, op); + cell = _Py_CAST(PyCellObject*, op); Ty_BEGIN_CRITICAL_SECTION(cell); res = cell->ob_ref; Ty_END_CRITICAL_SECTION(); @@ -36,7 +36,7 @@ static inline TyObject* TyCell_GET(TyObject *op) { static inline void TyCell_SET(TyObject *op, TyObject *value) { PyCellObject *cell; assert(TyCell_Check(op)); - cell = _Ty_CAST(PyCellObject*, op); + cell = _Py_CAST(PyCellObject*, op); Ty_BEGIN_CRITICAL_SECTION(cell); cell->ob_ref = value; Ty_END_CRITICAL_SECTION(); diff --git a/Include/cpython/classobject.h b/Include/cpython/classobject.h index 535867e..1d24857 100644 --- a/Include/cpython/classobject.h +++ b/Include/cpython/classobject.h @@ -27,7 +27,7 @@ PyAPI_FUNC(TyObject *) TyMethod_Function(TyObject *); PyAPI_FUNC(TyObject *) TyMethod_Self(TyObject *); #define _PyMethod_CAST(meth) \ - (assert(TyMethod_Check(meth)), _Ty_CAST(PyMethodObject*, meth)) + (assert(TyMethod_Check(meth)), _Py_CAST(PyMethodObject*, meth)) /* Static inline functions for direct access to these values. Type checks are *not* done, so use with care. */ @@ -55,7 +55,7 @@ PyAPI_FUNC(TyObject *) PyInstanceMethod_Function(TyObject *); #define _PyInstanceMethod_CAST(meth) \ (assert(PyInstanceMethod_Check(meth)), \ - _Ty_CAST(PyInstanceMethodObject*, meth)) + _Py_CAST(PyInstanceMethodObject*, meth)) /* Static inline function for direct access to these values. Type checks are *not* done, so use with care. */ diff --git a/Include/cpython/context.h b/Include/cpython/context.h index 1eef01f..7041f54 100644 --- a/Include/cpython/context.h +++ b/Include/cpython/context.h @@ -33,7 +33,7 @@ typedef enum { * passed to the watch callback is the now-current contextvars.Context * object, or None if no context is current. */ - Ty_CONTEXT_SWITCHED = 1, + Py_CONTEXT_SWITCHED = 1, } PyContextEvent; /* diff --git a/Include/cpython/dictobject.h b/Include/cpython/dictobject.h index d52266a..a5e7344 100644 --- a/Include/cpython/dictobject.h +++ b/Include/cpython/dictobject.h @@ -53,7 +53,7 @@ PyAPI_FUNC(int) TyDict_SetDefaultRef(TyObject *mp, TyObject *key, TyObject *defa static inline Ty_ssize_t TyDict_GET_SIZE(TyObject *op) { PyDictObject *mp; assert(TyDict_Check(op)); - mp = _Ty_CAST(PyDictObject*, op); + mp = _Py_CAST(PyDictObject*, op); #ifdef Ty_GIL_DISABLED return _Ty_atomic_load_ssize_relaxed(&mp->ma_used); #else diff --git a/Include/cpython/floatobject.h b/Include/cpython/floatobject.h index 1e6a3fa..674a8cd 100644 --- a/Include/cpython/floatobject.h +++ b/Include/cpython/floatobject.h @@ -8,7 +8,7 @@ typedef struct { } PyFloatObject; #define _TyFloat_CAST(op) \ - (assert(TyFloat_Check(op)), _Ty_CAST(PyFloatObject*, op)) + (assert(TyFloat_Check(op)), _Py_CAST(PyFloatObject*, op)) // Static inline version of TyFloat_AsDouble() trading safety for speed. // It doesn't check if op is a double object. diff --git a/Include/cpython/funcobject.h b/Include/cpython/funcobject.h index c53d75b..dd4a021 100644 --- a/Include/cpython/funcobject.h +++ b/Include/cpython/funcobject.h @@ -83,7 +83,7 @@ PyAPI_FUNC(TyObject *) TyFunction_GetAnnotations(TyObject *); PyAPI_FUNC(int) TyFunction_SetAnnotations(TyObject *, TyObject *); #define _PyFunction_CAST(func) \ - (assert(TyFunction_Check(func)), _Ty_CAST(PyFunctionObject*, func)) + (assert(TyFunction_Check(func)), _Py_CAST(PyFunctionObject*, func)) /* Static inline functions for direct access to these values. Type checks are *not* done, so use with care. */ diff --git a/Include/cpython/listobject.h b/Include/cpython/listobject.h index fdd5c7c..95ed8bd 100644 --- a/Include/cpython/listobject.h +++ b/Include/cpython/listobject.h @@ -23,7 +23,7 @@ typedef struct { /* Cast argument to PyListObject* type. */ #define _TyList_CAST(op) \ - (assert(TyList_Check(op)), _Ty_CAST(PyListObject*, (op))) + (assert(TyList_Check(op)), _Py_CAST(PyListObject*, (op))) // Macros and static inline functions, trading safety for speed diff --git a/Include/cpython/longobject.h b/Include/cpython/longobject.h index a180ce8..fcb75a6 100644 --- a/Include/cpython/longobject.h +++ b/Include/cpython/longobject.h @@ -3,7 +3,7 @@ #endif #define _TyLong_CAST(op) \ - (assert(TyLong_Check(op)), _Ty_CAST(PyLongObject*, (op))) + (assert(TyLong_Check(op)), _Py_CAST(PyLongObject*, (op))) PyAPI_FUNC(TyObject*) TyLong_FromUnicodeObject(TyObject *u, int base); diff --git a/Include/cpython/memoryobject.h b/Include/cpython/memoryobject.h index 0d57d57..f5ff363 100644 --- a/Include/cpython/memoryobject.h +++ b/Include/cpython/memoryobject.h @@ -35,7 +35,7 @@ typedef struct { Ty_ssize_t ob_array[1]; /* shape, strides, suboffsets */ } PyMemoryViewObject; -#define _PyMemoryView_CAST(op) _Ty_CAST(PyMemoryViewObject*, op) +#define _PyMemoryView_CAST(op) _Py_CAST(PyMemoryViewObject*, op) /* Get a pointer to the memoryview's private copy of the exporter's buffer. */ static inline Ty_buffer* TyMemoryView_GET_BUFFER(TyObject *op) { diff --git a/Include/cpython/object.h b/Include/cpython/object.h index 8500b57..c7cc0fa 100644 --- a/Include/cpython/object.h +++ b/Include/cpython/object.h @@ -349,7 +349,7 @@ PyAPI_FUNC(TyObject *) _TyObject_FunctionStr(TyObject *); #else #define Ty_SETREF(dst, src) \ do { \ - TyObject **_tmp_dst_ptr = _Ty_CAST(TyObject**, &(dst)); \ + TyObject **_tmp_dst_ptr = _Py_CAST(TyObject**, &(dst)); \ TyObject *_tmp_old_dst = (*_tmp_dst_ptr); \ TyObject *_tmp_src = _TyObject_CAST(src); \ memcpy(_tmp_dst_ptr, &_tmp_src, sizeof(TyObject*)); \ @@ -371,7 +371,7 @@ PyAPI_FUNC(TyObject *) _TyObject_FunctionStr(TyObject *); #else #define Ty_XSETREF(dst, src) \ do { \ - TyObject **_tmp_dst_ptr = _Ty_CAST(TyObject**, &(dst)); \ + TyObject **_tmp_dst_ptr = _Py_CAST(TyObject**, &(dst)); \ TyObject *_tmp_old_dst = (*_tmp_dst_ptr); \ TyObject *_tmp_src = _TyObject_CAST(src); \ memcpy(_tmp_dst_ptr, &_tmp_src, sizeof(TyObject*)); \ diff --git a/Include/cpython/setobject.h b/Include/cpython/setobject.h index ab9db3b..dadc20a 100644 --- a/Include/cpython/setobject.h +++ b/Include/cpython/setobject.h @@ -59,7 +59,7 @@ typedef struct { } PySetObject; #define _TySet_CAST(so) \ - (assert(PyAnySet_Check(so)), _Ty_CAST(PySetObject*, so)) + (assert(PyAnySet_Check(so)), _Py_CAST(PySetObject*, so)) static inline Ty_ssize_t TySet_GET_SIZE(TyObject *so) { #ifdef Ty_GIL_DISABLED diff --git a/Include/cpython/tupleobject.h b/Include/cpython/tupleobject.h index b35ad34..739c54d 100644 --- a/Include/cpython/tupleobject.h +++ b/Include/cpython/tupleobject.h @@ -16,7 +16,7 @@ PyAPI_FUNC(int) _TyTuple_Resize(TyObject **, Ty_ssize_t); /* Cast argument to PyTupleObject* type. */ #define _TyTuple_CAST(op) \ - (assert(TyTuple_Check(op)), _Ty_CAST(PyTupleObject*, (op))) + (assert(TyTuple_Check(op)), _Py_CAST(PyTupleObject*, (op))) // Macros and static inline functions, trading safety for speed diff --git a/Include/cpython/unicodeobject.h b/Include/cpython/unicodeobject.h index 74f90be..3aedbb3 100644 --- a/Include/cpython/unicodeobject.h +++ b/Include/cpython/unicodeobject.h @@ -186,13 +186,13 @@ typedef struct { #define _PyASCIIObject_CAST(op) \ (assert(TyUnicode_Check(op)), \ - _Ty_CAST(PyASCIIObject*, (op))) + _Py_CAST(PyASCIIObject*, (op))) #define _PyCompactUnicodeObject_CAST(op) \ (assert(TyUnicode_Check(op)), \ - _Ty_CAST(PyCompactUnicodeObject*, (op))) + _Py_CAST(PyCompactUnicodeObject*, (op))) #define _PyUnicodeObject_CAST(op) \ (assert(TyUnicode_Check(op)), \ - _Ty_CAST(PyUnicodeObject*, (op))) + _Py_CAST(PyUnicodeObject*, (op))) /* --- Flexible String Representation Helper Macros (PEP 393) -------------- */ @@ -216,7 +216,7 @@ static inline unsigned int TyUnicode_CHECK_INTERNED(TyObject *op) { #define TyUnicode_CHECK_INTERNED(op) TyUnicode_CHECK_INTERNED(_TyObject_CAST(op)) /* For backward compatibility. Soft-deprecated. */ -static inline unsigned int TyUnicode_IS_READY(TyObject* Ty_UNUSED(op)) { +static inline unsigned int TyUnicode_IS_READY(TyObject* Py_UNUSED(op)) { return 1; } #define TyUnicode_IS_READY(op) TyUnicode_IS_READY(_TyObject_CAST(op)) @@ -257,7 +257,7 @@ PyAPI_FUNC(int) TyUnicode_KIND(TyObject *op); // new compiler warnings on "kind < TyUnicode_KIND(str)" (compare signed and // unsigned numbers) where kind type is an int or on // "unsigned int kind = TyUnicode_KIND(str)" (cast signed to unsigned). -#define TyUnicode_KIND(op) _Ty_RVALUE(_PyASCIIObject_CAST(op)->state.kind) +#define TyUnicode_KIND(op) _Py_RVALUE(_PyASCIIObject_CAST(op)->state.kind) /* Return a void pointer to the raw unicode buffer. */ static inline void* _TyUnicode_COMPACT_DATA(TyObject *op) { @@ -324,7 +324,7 @@ static inline void TyUnicode_WRITE(int kind, void *data, } } #define TyUnicode_WRITE(kind, data, index, value) \ - TyUnicode_WRITE(_Ty_STATIC_CAST(int, kind), _Ty_CAST(void*, data), \ + TyUnicode_WRITE(_Ty_STATIC_CAST(int, kind), _Py_CAST(void*, data), \ (index), _Ty_STATIC_CAST(Ty_UCS4, value)) /* Read a code point from the string's canonical representation. No checks @@ -408,7 +408,7 @@ PyAPI_FUNC(TyObject*) TyUnicode_New( ); /* For backward compatibility. Soft-deprecated. */ -static inline int TyUnicode_READY(TyObject* Ty_UNUSED(op)) +static inline int TyUnicode_READY(TyObject* Py_UNUSED(op)) { return 0; } diff --git a/Include/cpython/weakrefobject.h b/Include/cpython/weakrefobject.h index 906d2f1..b93fa32 100644 --- a/Include/cpython/weakrefobject.h +++ b/Include/cpython/weakrefobject.h @@ -43,7 +43,7 @@ struct _PyWeakReference { PyAPI_FUNC(void) _TyWeakref_ClearRef(PyWeakReference *self); #define _TyWeakref_CAST(op) \ - (assert(PyWeakref_Check(op)), _Ty_CAST(PyWeakReference*, (op))) + (assert(PyWeakref_Check(op)), _Py_CAST(PyWeakReference*, (op))) // Test if a weak reference is dead. PyAPI_FUNC(int) PyWeakref_IsDead(TyObject *ref); diff --git a/Include/descrobject.h b/Include/descrobject.h index a4cd622..8fc25ca 100644 --- a/Include/descrobject.h +++ b/Include/descrobject.h @@ -80,7 +80,7 @@ struct TyMemberDef { #define _Ty_T_NONE 20 // Deprecated. Value is always None. /* Flags */ -#define Ty_READONLY 1 +#define Py_READONLY 1 #define Ty_AUDIT_READ 2 // Added in 3.10, harmless no-op before that #define _Ty_WRITE_RESTRICTED 4 // Deprecated, no-op. Do not reuse the value. #define Ty_RELATIVE_OFFSET 8 diff --git a/Include/internal/pycore_asdl.h b/Include/internal/pycore_asdl.h index 2d3628f..dc87ff4 100644 --- a/Include/internal/pycore_asdl.h +++ b/Include/internal/pycore_asdl.h @@ -78,9 +78,9 @@ asdl_ ## NAME ## _seq *_Ty_asdl_ ## NAME ## _seq_new(Ty_ssize_t size, PyArena *a return seq; \ } -#define asdl_seq_GET_UNTYPED(S, I) _Ty_RVALUE((S)->elements[(I)]) -#define asdl_seq_GET(S, I) _Ty_RVALUE((S)->typed_elements[(I)]) -#define asdl_seq_LEN(S) _Ty_RVALUE(((S) == NULL ? 0 : (S)->size)) +#define asdl_seq_GET_UNTYPED(S, I) _Py_RVALUE((S)->elements[(I)]) +#define asdl_seq_GET(S, I) _Py_RVALUE((S)->typed_elements[(I)]) +#define asdl_seq_LEN(S) _Py_RVALUE(((S) == NULL ? 0 : (S)->size)) #ifdef Ty_DEBUG # define asdl_seq_SET(S, I, V) \ @@ -91,7 +91,7 @@ asdl_ ## NAME ## _seq *_Ty_asdl_ ## NAME ## _seq_new(Ty_ssize_t size, PyArena *a (S)->typed_elements[_asdl_i] = (V); \ } while (0) #else -# define asdl_seq_SET(S, I, V) _Ty_RVALUE((S)->typed_elements[(I)] = (V)) +# define asdl_seq_SET(S, I, V) _Py_RVALUE((S)->typed_elements[(I)] = (V)) #endif #ifdef Ty_DEBUG @@ -103,7 +103,7 @@ asdl_ ## NAME ## _seq *_Ty_asdl_ ## NAME ## _seq_new(Ty_ssize_t size, PyArena *a (S)->elements[_asdl_i] = (V); \ } while (0) #else -# define asdl_seq_SET_UNTYPED(S, I, V) _Ty_RVALUE((S)->elements[(I)] = (V)) +# define asdl_seq_SET_UNTYPED(S, I, V) _Py_RVALUE((S)->elements[(I)] = (V)) #endif #ifdef __cplusplus diff --git a/Include/internal/pycore_call.h b/Include/internal/pycore_call.h index 9d5e316..374204c 100644 --- a/Include/internal/pycore_call.h +++ b/Include/internal/pycore_call.h @@ -76,7 +76,7 @@ _TyObject_VectorcallMethodId( { TyObject *oname = _TyUnicode_FromId(name); /* borrowed */ if (!oname) { - return _Ty_NULL; + return _Py_NULL; } return PyObject_VectorcallMethod(oname, args, nargsf, kwnames); } @@ -85,7 +85,7 @@ static inline TyObject * _TyObject_CallMethodIdNoArgs(TyObject *self, _Ty_Identifier *name) { size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET; - return _TyObject_VectorcallMethodId(name, &self, nargsf, _Ty_NULL); + return _TyObject_VectorcallMethodId(name, &self, nargsf, _Py_NULL); } static inline TyObject * @@ -94,7 +94,7 @@ _TyObject_CallMethodIdOneArg(TyObject *self, _Ty_Identifier *name, TyObject *arg TyObject *args[2] = {self, arg}; size_t nargsf = 2 | PY_VECTORCALL_ARGUMENTS_OFFSET; assert(arg != NULL); - return _TyObject_VectorcallMethodId(name, args, nargsf, _Ty_NULL); + return _TyObject_VectorcallMethodId(name, args, nargsf, _Py_NULL); } diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h index 2397827..78771c3 100644 --- a/Include/internal/pycore_code.h +++ b/Include/internal/pycore_code.h @@ -13,7 +13,7 @@ extern "C" { #include "pycore_tstate.h" // _PyThreadStateImpl -#define _TyCode_CODE(CO) _Ty_RVALUE((_Ty_CODEUNIT *)(CO)->co_code_adaptive) +#define _TyCode_CODE(CO) _Py_RVALUE((_Ty_CODEUNIT *)(CO)->co_code_adaptive) #define _TyCode_NBYTES(CO) (Ty_SIZE(CO) * (Ty_ssize_t)sizeof(_Ty_CODEUNIT)) diff --git a/Include/internal/pycore_dict.h b/Include/internal/pycore_dict.h index e41130d..bfe1d89 100644 --- a/Include/internal/pycore_dict.h +++ b/Include/internal/pycore_dict.h @@ -232,7 +232,7 @@ struct _dictvalues { TyObject *values[1]; }; -#define DK_LOG_SIZE(dk) _Ty_RVALUE((dk)->dk_log2_size) +#define DK_LOG_SIZE(dk) _Py_RVALUE((dk)->dk_log2_size) #if SIZEOF_VOID_P > 4 #define DK_SIZE(dk) (((int64_t)1)<NAME)) + _Py_CAST(TYPE*, _PyFreeList_Pop(&_Ty_freelists_GET()->NAME)) // Pops a non-TyObject data structure from the freelist, returns NULL if the // freelist is empty. diff --git a/Include/internal/pycore_gc.h b/Include/internal/pycore_gc.h index 2092505..e23e016 100644 --- a/Include/internal/pycore_gc.h +++ b/Include/internal/pycore_gc.h @@ -78,7 +78,7 @@ static inline int _TyObject_GC_IS_TRACKED(TyObject *op) { return (gc->_gc_next != 0); #endif } -#define _TyObject_GC_IS_TRACKED(op) _TyObject_GC_IS_TRACKED(_Ty_CAST(TyObject*, op)) +#define _TyObject_GC_IS_TRACKED(op) _TyObject_GC_IS_TRACKED(_Py_CAST(TyObject*, op)) /* True if the object may be tracked by the GC in the future, or already is. This can be useful to implement some optimizations. */ @@ -103,12 +103,12 @@ static inline int _TyObject_GC_MAY_BE_TRACKED(TyObject *obj) { static inline int _TyObject_GC_IS_SHARED(TyObject *op) { return _TyObject_HAS_GC_BITS(op, _TyGC_BITS_SHARED); } -#define _TyObject_GC_IS_SHARED(op) _TyObject_GC_IS_SHARED(_Ty_CAST(TyObject*, op)) +#define _TyObject_GC_IS_SHARED(op) _TyObject_GC_IS_SHARED(_Py_CAST(TyObject*, op)) static inline void _TyObject_GC_SET_SHARED(TyObject *op) { _TyObject_SET_GC_BITS(op, _TyGC_BITS_SHARED); } -#define _TyObject_GC_SET_SHARED(op) _TyObject_GC_SET_SHARED(_Ty_CAST(TyObject*, op)) +#define _TyObject_GC_SET_SHARED(op) _TyObject_GC_SET_SHARED(_Py_CAST(TyObject*, op)) #endif diff --git a/Include/internal/pycore_hashtable.h b/Include/internal/pycore_hashtable.h index b47d5c3..7284e25 100644 --- a/Include/internal/pycore_hashtable.h +++ b/Include/internal/pycore_hashtable.h @@ -18,9 +18,9 @@ typedef struct { _Ty_slist_item_t *head; } _Ty_slist_t; -#define _Ty_SLIST_ITEM_NEXT(ITEM) _Ty_RVALUE(((_Ty_slist_item_t *)(ITEM))->next) +#define _Ty_SLIST_ITEM_NEXT(ITEM) _Py_RVALUE(((_Ty_slist_item_t *)(ITEM))->next) -#define _Ty_SLIST_HEAD(SLIST) _Ty_RVALUE(((_Ty_slist_t *)(SLIST))->head) +#define _Ty_SLIST_HEAD(SLIST) _Py_RVALUE(((_Ty_slist_t *)(SLIST))->head) /* _Ty_hashtable: table entry */ diff --git a/Include/internal/pycore_interp_structs.h b/Include/internal/pycore_interp_structs.h index c6eecf5..a96979f 100644 --- a/Include/internal/pycore_interp_structs.h +++ b/Include/internal/pycore_interp_structs.h @@ -459,7 +459,7 @@ struct _py_func_state { }; #include "pycore_dict_state.h" // struct _Ty_dict_state -#include "pycore_exceptions.h" // struct _Ty_exc_state +#include "pycore_exceptions.h" // struct _Py_exc_state /****** type state *********/ @@ -930,7 +930,7 @@ struct _is { struct _py_code_state code_state; struct _Ty_dict_state dict_state; - struct _Ty_exc_state exc_state; + struct _Py_exc_state exc_state; struct _Ty_mem_interp_free_queue mem_free_queue; struct ast_state ast; diff --git a/Include/internal/pycore_list.h b/Include/internal/pycore_list.h index a9a60b4..e5cba8f 100644 --- a/Include/internal/pycore_list.h +++ b/Include/internal/pycore_list.h @@ -25,7 +25,7 @@ extern TyObject* _TyList_GetItemRef(PyListObject *, Ty_ssize_t i); extern int _TyList_GetItemRefNoLock(PyListObject *, Ty_ssize_t, _PyStackRef *); #endif -#define _TyList_ITEMS(op) _Ty_RVALUE(_TyList_CAST(op)->ob_item) +#define _TyList_ITEMS(op) _Py_RVALUE(_TyList_CAST(op)->ob_item) PyAPI_FUNC(int) _TyList_AppendTakeRefListResize(PyListObject *self, TyObject *newitem); diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index 16b8ab0..0d783a1 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -994,7 +994,7 @@ PyAPI_FUNC(TyObject*) _TyObject_GetState(TyObject *); PyAPI_DATA(TyTypeObject) _PyNone_Type; PyAPI_DATA(TyTypeObject) _PyNotImplemented_Type; -// Maps Ty_LT to Ty_GT, ..., Ty_GE to Ty_LE. +// Maps Py_LT to Py_GT, ..., Py_GE to Py_LE. // Export for the stable ABI. PyAPI_DATA(int) _Ty_SwappedOp[]; diff --git a/Include/internal/pycore_tuple.h b/Include/internal/pycore_tuple.h index a534d97..88d8582 100644 --- a/Include/internal/pycore_tuple.h +++ b/Include/internal/pycore_tuple.h @@ -21,7 +21,7 @@ extern PyStatus _TyTuple_InitGlobalObjects(PyInterpreterState *); /* other API */ -#define _TyTuple_ITEMS(op) _Ty_RVALUE(_TyTuple_CAST(op)->ob_item) +#define _TyTuple_ITEMS(op) _Py_RVALUE(_TyTuple_CAST(op)->ob_item) PyAPI_FUNC(TyObject *)_TyTuple_FromArray(TyObject *const *, Ty_ssize_t); PyAPI_FUNC(TyObject *)_TyTuple_FromStackRefStealOnSuccess(const union _PyStackRef *, Ty_ssize_t); diff --git a/Include/internal/pycore_weakref.h b/Include/internal/pycore_weakref.h index 10d979b..ea9206f 100644 --- a/Include/internal/pycore_weakref.h +++ b/Include/internal/pycore_weakref.h @@ -72,7 +72,7 @@ static inline int _is_dead(TyObject *obj) static inline TyObject* _TyWeakref_GET_REF(TyObject *ref_obj) { assert(PyWeakref_Check(ref_obj)); - PyWeakReference *ref = _Ty_CAST(PyWeakReference*, ref_obj); + PyWeakReference *ref = _Py_CAST(PyWeakReference*, ref_obj); TyObject *obj = FT_ATOMIC_LOAD_PTR(ref->wr_object); if (obj == Ty_None) { @@ -100,7 +100,7 @@ static inline int _TyWeakref_IS_DEAD(TyObject *ref_obj) { assert(PyWeakref_Check(ref_obj)); int ret = 0; - PyWeakReference *ref = _Ty_CAST(PyWeakReference*, ref_obj); + PyWeakReference *ref = _Py_CAST(PyWeakReference*, ref_obj); TyObject *obj = FT_ATOMIC_LOAD_PTR(ref->wr_object); if (obj == Ty_None) { // clear_weakref() was called diff --git a/Include/methodobject.h b/Include/methodobject.h index 996a04a..37c2e35 100644 --- a/Include/methodobject.h +++ b/Include/methodobject.h @@ -45,7 +45,7 @@ typedef PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords; // "void func(void)" type to prevent compiler warnings. // // If a function is declared with the METH_NOARGS calling convention, it must -// have 2 parameters. Since the second parameter is unused, Ty_UNUSED() can be +// have 2 parameters. Since the second parameter is unused, Py_UNUSED() can be // used to prevent a compiler warning. If the function has a single parameter, // it triggers an undefined behavior when Python calls it with 2 parameters // (bpo-33012). diff --git a/Include/moduleobject.h b/Include/moduleobject.h index c52c16f..854b34e 100644 --- a/Include/moduleobject.h +++ b/Include/moduleobject.h @@ -58,10 +58,10 @@ typedef struct PyModuleDef_Base { } PyModuleDef_Base; #define PyModuleDef_HEAD_INIT { \ - PyObject_HEAD_INIT(_Ty_NULL) \ - _Ty_NULL, /* m_init */ \ + PyObject_HEAD_INIT(_Py_NULL) \ + _Py_NULL, /* m_init */ \ 0, /* m_index */ \ - _Ty_NULL, /* m_copy */ \ + _Py_NULL, /* m_copy */ \ } #if !defined(Ty_LIMITED_API) || Ty_LIMITED_API+0 >= 0x03050000 diff --git a/Include/object.h b/Include/object.h index 3225a89..d32d45e 100644 --- a/Include/object.h +++ b/Include/object.h @@ -164,7 +164,7 @@ struct _object { #endif /* Cast argument to TyObject* type. */ -#define _TyObject_CAST(op) _Ty_CAST(TyObject*, (op)) +#define _TyObject_CAST(op) _Py_CAST(TyObject*, (op)) typedef struct { TyObject ob_base; @@ -172,7 +172,7 @@ typedef struct { } TyVarObject; /* Cast argument to TyVarObject* type. */ -#define _PyVarObject_CAST(op) _Ty_CAST(TyVarObject*, (op)) +#define _PyVarObject_CAST(op) _Py_CAST(TyVarObject*, (op)) // Test if the 'x' object is the 'y' object, the same as "x is y" in Python. @@ -657,9 +657,9 @@ PyAPI_FUNC(int) Ty_IsNone(TyObject *x); /* Macro for returning Ty_None from a function. * Only treat Ty_None as immortal in the limited C API 3.12 and newer. */ #if defined(Ty_LIMITED_API) && Ty_LIMITED_API+0 < 0x030c0000 -# define Ty_RETURN_NONE return Ty_NewRef(Ty_None) +# define Py_RETURN_NONE return Ty_NewRef(Ty_None) #else -# define Ty_RETURN_NONE return Ty_None +# define Py_RETURN_NONE return Ty_None #endif /* @@ -675,15 +675,15 @@ PyAPI_DATA(TyObject) _Ty_NotImplementedStruct; /* Don't use this directly */ #endif /* Macro for returning Ty_NotImplemented from a function */ -#define Ty_RETURN_NOTIMPLEMENTED return Ty_NotImplemented +#define Py_RETURN_NOTIMPLEMENTED return Ty_NotImplemented /* Rich comparison opcodes */ -#define Ty_LT 0 -#define Ty_LE 1 -#define Ty_EQ 2 -#define Ty_NE 3 -#define Ty_GT 4 -#define Ty_GE 5 +#define Py_LT 0 +#define Py_LE 1 +#define Py_EQ 2 +#define Py_NE 3 +#define Py_GT 4 +#define Py_GE 5 #if !defined(Ty_LIMITED_API) || Ty_LIMITED_API+0 >= 0x030A0000 /* Result of calling TyIter_Send */ @@ -699,15 +699,15 @@ typedef enum { * * Needs to be a macro because any C-comparable type can be used. */ -#define Ty_RETURN_RICHCOMPARE(val1, val2, op) \ +#define Py_RETURN_RICHCOMPARE(val1, val2, op) \ do { \ switch (op) { \ - case Ty_EQ: if ((val1) == (val2)) Ty_RETURN_TRUE; Ty_RETURN_FALSE; \ - case Ty_NE: if ((val1) != (val2)) Ty_RETURN_TRUE; Ty_RETURN_FALSE; \ - case Ty_LT: if ((val1) < (val2)) Ty_RETURN_TRUE; Ty_RETURN_FALSE; \ - case Ty_GT: if ((val1) > (val2)) Ty_RETURN_TRUE; Ty_RETURN_FALSE; \ - case Ty_LE: if ((val1) <= (val2)) Ty_RETURN_TRUE; Ty_RETURN_FALSE; \ - case Ty_GE: if ((val1) >= (val2)) Ty_RETURN_TRUE; Ty_RETURN_FALSE; \ + case Py_EQ: if ((val1) == (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_NE: if ((val1) != (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_LT: if ((val1) < (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_GT: if ((val1) > (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_LE: if ((val1) <= (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_GE: if ((val1) >= (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ default: \ Ty_UNREACHABLE(); \ } \ @@ -800,7 +800,7 @@ static inline int TyType_Check(TyObject *op) { #endif #define _TyType_CAST(op) \ - (assert(TyType_Check(op)), _Ty_CAST(TyTypeObject*, (op))) + (assert(TyType_Check(op)), _Py_CAST(TyTypeObject*, (op))) static inline int TyType_CheckExact(TyObject *op) { return Ty_IS_TYPE(op, &TyType_Type); diff --git a/Include/objimpl.h b/Include/objimpl.h index 1063366..2084508 100644 --- a/Include/objimpl.h +++ b/Include/objimpl.h @@ -178,9 +178,9 @@ PyAPI_FUNC(void) PyObject_GC_UnTrack(void *); PyAPI_FUNC(void) PyObject_GC_Del(void *); #define PyObject_GC_New(type, typeobj) \ - _Ty_CAST(type*, _TyObject_GC_New(typeobj)) + _Py_CAST(type*, _TyObject_GC_New(typeobj)) #define PyObject_GC_NewVar(type, typeobj, n) \ - _Ty_CAST(type*, _TyObject_GC_NewVar((typeobj), (n))) + _Py_CAST(type*, _TyObject_GC_NewVar((typeobj), (n))) PyAPI_FUNC(int) PyObject_GC_IsTracked(TyObject *); PyAPI_FUNC(int) PyObject_GC_IsFinalized(TyObject *); diff --git a/Include/pymacro.h b/Include/pymacro.h index e1e5d48..3ea632e 100644 --- a/Include/pymacro.h +++ b/Include/pymacro.h @@ -173,21 +173,21 @@ /* Use this for unused arguments in a function definition to silence compiler * warnings. Example: * - * int func(int a, int Ty_UNUSED(b)) { return a; } + * int func(int a, int Py_UNUSED(b)) { return a; } */ #if defined(__GNUC__) || defined(__clang__) -# define Ty_UNUSED(name) _unused_ ## name __attribute__((unused)) +# define Py_UNUSED(name) _unused_ ## name __attribute__((unused)) #elif defined(_MSC_VER) // Disable warning C4100: unreferenced formal parameter, // declare the parameter, // restore old compiler warnings. -# define Ty_UNUSED(name) \ +# define Py_UNUSED(name) \ __pragma(warning(push)) \ __pragma(warning(suppress: 4100)) \ _unused_ ## name \ __pragma(warning(pop)) #else -# define Ty_UNUSED(name) _unused_ ## name +# define Py_UNUSED(name) _unused_ ## name #endif #if defined(RANDALL_WAS_HERE) @@ -223,8 +223,8 @@ (type*)((char*)ptr - offsetof(type, member)) // Prevent using an expression as a l-value. -// For example, "int x; _Ty_RVALUE(x) = 1;" fails with a compiler error. -#define _Ty_RVALUE(EXPR) ((void)0, (EXPR)) +// For example, "int x; _Py_RVALUE(x) = 1;" fails with a compiler error. +#define _Py_RVALUE(EXPR) ((void)0, (EXPR)) // Return non-zero if the type is signed, return zero if it's unsigned. // Use "<= 0" rather than "< 0" to prevent the compiler warning: diff --git a/Include/pyport.h b/Include/pyport.h index 26ebf08..6ffbd75 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -34,7 +34,7 @@ # define _Ty_STATIC_CAST(type, expr) ((type)(expr)) #endif // Macro to use the more powerful/dangerous C-style cast even in C++. -#define _Ty_CAST(type, expr) ((type)(expr)) +#define _Py_CAST(type, expr) ((type)(expr)) // Cast a function to another function type T. // @@ -44,16 +44,16 @@ // Note that using this cast only prevents the compiler from emitting // warnings, but does not prevent an undefined behavior at runtime if // the original function signature is not respected. -#define _Ty_FUNC_CAST(T, func) _Ty_CAST(T, _Ty_CAST(void(*)(void), (func))) +#define _Ty_FUNC_CAST(T, func) _Py_CAST(T, _Py_CAST(void(*)(void), (func))) -// Static inline functions should use _Ty_NULL rather than using directly NULL +// Static inline functions should use _Py_NULL rather than using directly NULL // to prevent C++ compiler warnings. On C23 and newer and on C++11 and newer, -// _Ty_NULL is defined as nullptr. +// _Py_NULL is defined as nullptr. #if (defined (__STDC_VERSION__) && __STDC_VERSION__ > 201710L) \ || (defined(__cplusplus) && __cplusplus >= 201103) -# define _Ty_NULL nullptr +# define _Py_NULL nullptr #else -# define _Ty_NULL NULL +# define _Py_NULL NULL #endif @@ -462,8 +462,8 @@ extern "C" { #define Ty_LL(x) x##LL #endif -#ifndef Ty_ULL -#define Ty_ULL(x) Ty_LL(x##U) +#ifndef Py_ULL +#define Py_ULL(x) Ty_LL(x##U) #endif #define Ty_VA_COPY va_copy diff --git a/Include/refcount.h b/Include/refcount.h index 0cfdd26..7006f62 100644 --- a/Include/refcount.h +++ b/Include/refcount.h @@ -126,7 +126,7 @@ static inline Ty_ALWAYS_INLINE int _Ty_IsImmortal(TyObject *op) return (_Ty_atomic_load_uint32_relaxed(&op->ob_ref_local) == _Ty_IMMORTAL_REFCNT_LOCAL); #elif SIZEOF_VOID_P > 4 - return _Ty_CAST(PY_INT32_T, op->ob_refcnt) < 0; + return _Py_CAST(PY_INT32_T, op->ob_refcnt) < 0; #else return op->ob_refcnt >= _Ty_IMMORTAL_MINIMUM_REFCNT; #endif @@ -477,17 +477,17 @@ static inline Ty_ALWAYS_INLINE void Ty_DECREF(TyObject *op) _Ty_TYPEOF(op)* _tmp_op_ptr = &(op); \ _Ty_TYPEOF(op) _tmp_old_op = (*_tmp_op_ptr); \ if (_tmp_old_op != NULL) { \ - *_tmp_op_ptr = _Ty_NULL; \ + *_tmp_op_ptr = _Py_NULL; \ Ty_DECREF(_tmp_old_op); \ } \ } while (0) #else #define Ty_CLEAR(op) \ do { \ - TyObject **_tmp_op_ptr = _Ty_CAST(TyObject**, &(op)); \ + TyObject **_tmp_op_ptr = _Py_CAST(TyObject**, &(op)); \ TyObject *_tmp_old_op = (*_tmp_op_ptr); \ if (_tmp_old_op != NULL) { \ - TyObject *_null_ptr = _Ty_NULL; \ + TyObject *_null_ptr = _Py_NULL; \ memcpy(_tmp_op_ptr, &_null_ptr, sizeof(TyObject*)); \ Ty_DECREF(_tmp_old_op); \ } \ @@ -498,7 +498,7 @@ static inline Ty_ALWAYS_INLINE void Ty_DECREF(TyObject *op) /* Function to use in case the object pointer can be NULL: */ static inline void Ty_XINCREF(TyObject *op) { - if (op != _Ty_NULL) { + if (op != _Py_NULL) { Ty_INCREF(op); } } @@ -508,7 +508,7 @@ static inline void Ty_XINCREF(TyObject *op) static inline void Ty_XDECREF(TyObject *op) { - if (op != _Ty_NULL) { + if (op != _Py_NULL) { Ty_DECREF(op); } } diff --git a/Include/structmember.h b/Include/structmember.h index c626fc3..f9313d7 100644 --- a/Include/structmember.h +++ b/Include/structmember.h @@ -43,7 +43,7 @@ extern "C" { #define T_NONE _Ty_T_NONE /* Flags */ -#define READONLY Ty_READONLY +#define READONLY Py_READONLY #define PY_AUDIT_READ Ty_AUDIT_READ #define READ_RESTRICTED Ty_AUDIT_READ #define PY_WRITE_RESTRICTED _Ty_WRITE_RESTRICTED diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index f6a04a1..73403fd 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -982,14 +982,14 @@ PyAPI_FUNC(int) TyUnicode_Equal(TyObject *str1, TyObject *str2); Possible values for op: - Ty_GT, Ty_GE, Ty_EQ, Ty_NE, Ty_LT, Ty_LE + Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE */ PyAPI_FUNC(TyObject *) TyUnicode_RichCompare( TyObject *left, /* Left string */ TyObject *right, /* Right string */ - int op /* Operation: Ty_EQ, Ty_NE, Ty_GT, etc. */ + int op /* Operation: Py_EQ, Py_NE, Py_GT, etc. */ ); /* Apply an argument tuple or dictionary to a format string and return diff --git a/Lib/test/clinic.test.c b/Lib/test/clinic.test.c index 205db2f..3a840d2 100644 --- a/Lib/test/clinic.test.c +++ b/Lib/test/clinic.test.c @@ -4044,7 +4044,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_condition_a__doc__, {"test_preprocessor_guarded_condition_a", (PyCFunction)test_preprocessor_guarded_condition_a, METH_NOARGS, test_preprocessor_guarded_condition_a__doc__}, static TyObject * -test_preprocessor_guarded_condition_a(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_preprocessor_guarded_condition_a(TyObject *module, TyObject *Py_UNUSED(ignored)) { return test_preprocessor_guarded_condition_a_impl(module); } @@ -4062,7 +4062,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_elif_condition_b__doc__, {"test_preprocessor_guarded_elif_condition_b", (PyCFunction)test_preprocessor_guarded_elif_condition_b, METH_NOARGS, test_preprocessor_guarded_elif_condition_b__doc__}, static TyObject * -test_preprocessor_guarded_elif_condition_b(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_preprocessor_guarded_elif_condition_b(TyObject *module, TyObject *Py_UNUSED(ignored)) { return test_preprocessor_guarded_elif_condition_b_impl(module); } @@ -4080,7 +4080,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_else__doc__, {"test_preprocessor_guarded_else", (PyCFunction)test_preprocessor_guarded_else, METH_NOARGS, test_preprocessor_guarded_else__doc__}, static TyObject * -test_preprocessor_guarded_else(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_preprocessor_guarded_else(TyObject *module, TyObject *Py_UNUSED(ignored)) { return test_preprocessor_guarded_else_impl(module); } @@ -4098,7 +4098,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_ifndef_condition_c__doc__, {"test_preprocessor_guarded_ifndef_condition_c", (PyCFunction)test_preprocessor_guarded_ifndef_condition_c, METH_NOARGS, test_preprocessor_guarded_ifndef_condition_c__doc__}, static TyObject * -test_preprocessor_guarded_ifndef_condition_c(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_preprocessor_guarded_ifndef_condition_c(TyObject *module, TyObject *Py_UNUSED(ignored)) { return test_preprocessor_guarded_ifndef_condition_c_impl(module); } @@ -4116,7 +4116,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_ifndef_not_condition_c__doc__, {"test_preprocessor_guarded_ifndef_not_condition_c", (PyCFunction)test_preprocessor_guarded_ifndef_not_condition_c, METH_NOARGS, test_preprocessor_guarded_ifndef_not_condition_c__doc__}, static TyObject * -test_preprocessor_guarded_ifndef_not_condition_c(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_preprocessor_guarded_ifndef_not_condition_c(TyObject *module, TyObject *Py_UNUSED(ignored)) { return test_preprocessor_guarded_ifndef_not_condition_c_impl(module); } @@ -4134,7 +4134,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_if_with_continuation__doc__, {"test_preprocessor_guarded_if_with_continuation", (PyCFunction)test_preprocessor_guarded_if_with_continuation, METH_NOARGS, test_preprocessor_guarded_if_with_continuation__doc__}, static TyObject * -test_preprocessor_guarded_if_with_continuation(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_preprocessor_guarded_if_with_continuation(TyObject *module, TyObject *Py_UNUSED(ignored)) { return test_preprocessor_guarded_if_with_continuation_impl(module); } @@ -4153,7 +4153,7 @@ PyDoc_STRVAR(test_preprocessor_guarded_if_e_or_f__doc__, {"test_preprocessor_guarded_if_e_or_f", (PyCFunction)test_preprocessor_guarded_if_e_or_f, METH_NOARGS, test_preprocessor_guarded_if_e_or_f__doc__}, static TyObject * -test_preprocessor_guarded_if_e_or_f(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_preprocessor_guarded_if_e_or_f(TyObject *module, TyObject *Py_UNUSED(ignored)) { return test_preprocessor_guarded_if_e_or_f_impl(module); } @@ -5189,7 +5189,7 @@ static TyObject * Test_class_method_impl(TyTypeObject *type); static TyObject * -Test_class_method(TyObject *type, TyObject *Ty_UNUSED(ignored)) +Test_class_method(TyObject *type, TyObject *Py_UNUSED(ignored)) { return Test_class_method_impl((TyTypeObject *)type); } @@ -5216,7 +5216,7 @@ static TyObject * Test_static_method_impl(); static TyObject * -Test_static_method(TyObject *null, TyObject *Ty_UNUSED(ignored)) +Test_static_method(TyObject *null, TyObject *Py_UNUSED(ignored)) { return Test_static_method_impl(); } @@ -5243,7 +5243,7 @@ static TyObject * Test_meth_coexist_impl(TestObj *self); static TyObject * -Test_meth_coexist(TyObject *self, TyObject *Ty_UNUSED(ignored)) +Test_meth_coexist(TyObject *self, TyObject *Py_UNUSED(ignored)) { return Test_meth_coexist_impl((TestObj *)self); } @@ -5271,7 +5271,7 @@ static TyObject * Test_property_get_impl(TestObj *self); static TyObject * -Test_property_get(TyObject *self, void *Ty_UNUSED(context)) +Test_property_get(TyObject *self, void *Py_UNUSED(context)) { return Test_property_get_impl((TestObj *)self); } @@ -5299,7 +5299,7 @@ static int Test_property_set_impl(TestObj *self, TyObject *value); static int -Test_property_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +Test_property_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -5331,7 +5331,7 @@ static int Test_setter_first_with_docstr_set_impl(TestObj *self, TyObject *value); static int -Test_setter_first_with_docstr_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +Test_setter_first_with_docstr_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -5372,7 +5372,7 @@ static TyObject * Test_setter_first_with_docstr_get_impl(TestObj *self); static TyObject * -Test_setter_first_with_docstr_get(TyObject *self, void *Ty_UNUSED(context)) +Test_setter_first_with_docstr_get(TyObject *self, void *Py_UNUSED(context)) { return Test_setter_first_with_docstr_get_impl((TestObj *)self); } @@ -5525,7 +5525,7 @@ static int bool_return_impl(TyObject *module); static TyObject * -bool_return(TyObject *module, TyObject *Ty_UNUSED(ignored)) +bool_return(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -5561,7 +5561,7 @@ static double double_return_impl(TyObject *module); static TyObject * -double_return(TyObject *module, TyObject *Ty_UNUSED(ignored)) +double_return(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; double _return_value; @@ -5878,7 +5878,7 @@ static TyObject * test_critical_section_impl(TyObject *module); static TyObject * -test_critical_section(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_critical_section(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Modules/_abc.c b/Modules/_abc.c index dadea79..4da691f 100644 --- a/Modules/_abc.c +++ b/Modules/_abc.c @@ -205,14 +205,14 @@ _destroy(TyObject *setweakref, TyObject *objweakref) { TyObject *set = _TyWeakref_GET_REF(setweakref); if (set == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (TySet_Discard(set, objweakref) < 0) { Ty_DECREF(set); return NULL; } Ty_DECREF(set); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef _destroy_def = { @@ -284,7 +284,7 @@ _abc__reset_registry(TyObject *module, TyObject *self) return NULL; } Ty_DECREF(impl); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -321,7 +321,7 @@ _abc__reset_caches(TyObject *module, TyObject *self) return NULL; } Ty_DECREF(impl); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -525,7 +525,7 @@ _abc__abc_init(TyObject *module, TyObject *self) } if (flags == NULL || !TyLong_CheckExact(flags)) { Ty_XDECREF(flags); - Ty_RETURN_NONE; + Py_RETURN_NONE; } long val = TyLong_AsLong(flags); @@ -539,7 +539,7 @@ _abc__abc_init(TyObject *module, TyObject *self) } _TyType_SetFlags((TyTypeObject *)self, 0, val & COLLECTION_FLAGS); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c index 79240d7..35660d4 100644 --- a/Modules/_asynciomodule.c +++ b/Modules/_asynciomodule.c @@ -653,7 +653,7 @@ future_set_result(asyncio_state *state, FutureObj *fut, TyObject *res) if (future_schedule_callbacks(state, fut) == -1) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -721,7 +721,7 @@ future_set_exception(asyncio_state *state, FutureObj *fut, TyObject *exc) } fut->fut_log_tb = 1; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -866,7 +866,7 @@ future_add_done_callback(asyncio_state *state, FutureObj *fut, TyObject *arg, } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -877,7 +877,7 @@ future_cancel(asyncio_state *state, FutureObj *fut, TyObject *msg) fut->fut_log_tb = 0; if (fut->fut_state != STATE_PENDING) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } fut->fut_state = STATE_CANCELLED; @@ -888,7 +888,7 @@ future_cancel(asyncio_state *state, FutureObj *fut, TyObject *msg) return NULL; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -1044,7 +1044,7 @@ _asyncio_Future_exception_impl(FutureObj *self, TyTypeObject *cls) return Ty_NewRef(self->fut_exception); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1160,7 +1160,7 @@ _asyncio_Future_remove_done_callback_impl(FutureObj *self, TyTypeObject *cls, // before a recursive call is made with that same arg. For details, see // https://github.com/python/cpython/pull/125967#discussion_r1816593340. TyObject *fut_callback0 = Ty_NewRef(self->fut_callback0); - int cmp = PyObject_RichCompareBool(fut_callback0, fn, Ty_EQ); + int cmp = PyObject_RichCompareBool(fut_callback0, fn, Py_EQ); Ty_DECREF(fut_callback0); if (cmp == -1) { return NULL; @@ -1187,7 +1187,7 @@ _asyncio_Future_remove_done_callback_impl(FutureObj *self, TyTypeObject *cls, TyObject *cb_tup = TyList_GET_ITEM(self->fut_callbacks, 0); Ty_INCREF(cb_tup); int cmp = PyObject_RichCompareBool( - TyTuple_GET_ITEM(cb_tup, 0), fn, Ty_EQ); + TyTuple_GET_ITEM(cb_tup, 0), fn, Py_EQ); Ty_DECREF(cb_tup); if (cmp == -1) { return NULL; @@ -1214,7 +1214,7 @@ _asyncio_Future_remove_done_callback_impl(FutureObj *self, TyTypeObject *cls, int ret; TyObject *item = TyList_GET_ITEM(self->fut_callbacks, i); Ty_INCREF(item); - ret = PyObject_RichCompareBool(TyTuple_GET_ITEM(item, 0), fn, Ty_EQ); + ret = PyObject_RichCompareBool(TyTuple_GET_ITEM(item, 0), fn, Py_EQ); if (ret == 0) { if (j < len) { TyList_SET_ITEM(newlist, j, item); @@ -1291,10 +1291,10 @@ _asyncio_Future_cancelled_impl(FutureObj *self) /*[clinic end generated code: output=145197ced586357d input=9b8644819a675416]*/ { if (future_is_alive(self) && self->fut_state == STATE_CANCELLED) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } @@ -1313,10 +1313,10 @@ _asyncio_Future_done_impl(FutureObj *self) /*[clinic end generated code: output=244c5ac351145096 input=7204d3cc63bef7f3]*/ { if (!future_is_alive(self) || self->fut_state == STATE_PENDING) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } else { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } } @@ -1351,7 +1351,7 @@ _asyncio_Future__asyncio_awaited_by_get_impl(FutureObj *self) { /* Implementation of a Python getter. */ if (self->fut_awaited_by == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (self->fut_awaited_by_is_set) { /* Already a set, just wrap it into a frozen set and return. */ @@ -1382,10 +1382,10 @@ _asyncio_Future__asyncio_future_blocking_get_impl(FutureObj *self) /*[clinic end generated code: output=a558a2c51e38823b input=58da92efc03b617d]*/ { if (future_is_alive(self) && self->fut_blocking) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } @@ -1430,10 +1430,10 @@ _asyncio_Future__log_traceback_get_impl(FutureObj *self) asyncio_state *state = get_asyncio_state_by_def((TyObject *)self); ENSURE_FUTURE_ALIVE(state, self) if (self->fut_log_tb) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } @@ -1474,7 +1474,7 @@ _asyncio_Future__loop_get_impl(FutureObj *self) /*[clinic end generated code: output=5ba31563eecfeedf input=0337130bc5781670]*/ { if (!future_is_alive(self)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->fut_loop); } @@ -1501,7 +1501,7 @@ _asyncio_Future__callbacks_get_impl(FutureObj *self) } if (len == 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *callbacks = TyList_New(len); @@ -1549,7 +1549,7 @@ _asyncio_Future__result_get_impl(FutureObj *self) asyncio_state *state = get_asyncio_state_by_def((TyObject *)self); ENSURE_FUTURE_ALIVE(state, self) if (self->fut_result == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->fut_result); } @@ -1567,7 +1567,7 @@ _asyncio_Future__exception_get_impl(FutureObj *self) asyncio_state *state = get_asyncio_state_by_def((TyObject *)self); ENSURE_FUTURE_ALIVE(state, self) if (self->fut_exception == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->fut_exception); } @@ -1583,7 +1583,7 @@ _asyncio_Future__source_traceback_get_impl(FutureObj *self) /*[clinic end generated code: output=d4f12b09af22f61b input=3c831fbde5da90d0]*/ { if (!future_is_alive(self) || self->fut_source_tb == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->fut_source_tb); } @@ -1599,7 +1599,7 @@ _asyncio_Future__cancel_message_get_impl(FutureObj *self) /*[clinic end generated code: output=52ef6444f92cedac input=54c12c67082e4eea]*/ { if (self->fut_cancel_msg == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->fut_cancel_msg); } @@ -1876,7 +1876,7 @@ FutureIter_am_send_lock_held(futureiterobject *it, TyObject **result) static PySendResult FutureIter_am_send(TyObject *op, - TyObject *Ty_UNUSED(arg), + TyObject *Py_UNUSED(arg), TyObject **result) { futureiterobject *it = (futureiterobject*)op; @@ -2003,7 +2003,7 @@ static TyObject * FutureIter_close(TyObject *self, TyObject *arg) { (void)FutureIter_clear(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -2134,13 +2134,13 @@ TaskStepMethWrapper_traverse(TyObject *op, } static TyObject * -TaskStepMethWrapper_get___self__(TyObject *op, void *Ty_UNUSED(closure)) +TaskStepMethWrapper_get___self__(TyObject *op, void *Py_UNUSED(closure)) { TaskStepMethWrapper *o = (TaskStepMethWrapper*)op; if (o->sw_task) { return Ty_NewRef(o->sw_task); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyGetSetDef TaskStepMethWrapper_getsetlist[] = { @@ -2303,7 +2303,7 @@ swap_current_task(TyObject *loop, TyObject *task) ts->asyncio_running_task = NULL; } if (prev_task == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return prev_task; } @@ -2460,10 +2460,10 @@ _asyncio_Task__log_destroy_pending_get_impl(TaskObj *self) /*[clinic end generated code: output=e6c2a47d029ac93b input=17127298cd4c720b]*/ { if (self->task_log_destroy_pending) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } @@ -2501,10 +2501,10 @@ _asyncio_Task__must_cancel_get_impl(TaskObj *self) /*[clinic end generated code: output=70e79b900996c363 input=2d04529fb23feedf]*/ { if (self->task_must_cancel) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } @@ -2522,7 +2522,7 @@ _asyncio_Task__coro_get_impl(TaskObj *self) return Ty_NewRef(self->task_coro); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2540,7 +2540,7 @@ _asyncio_Task__fut_waiter_get_impl(TaskObj *self) return Ty_NewRef(self->task_fut_waiter); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -2605,7 +2605,7 @@ _asyncio_Task_cancel_impl(TaskObj *self, TyObject *msg) self->task_log_tb = 0; if (self->task_state != STATE_PENDING) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } self->task_num_cancels_requested += 1; @@ -2614,7 +2614,7 @@ _asyncio_Task_cancel_impl(TaskObj *self, TyObject *msg) // https://github.com/python/cpython/pull/31394#issuecomment-1053545331 // and corresponding code in tasks.py. // if (self->task_num_cancels_requested > 1) { - // Ty_RETURN_FALSE; + // Py_RETURN_FALSE; // } if (self->task_fut_waiter) { @@ -2634,14 +2634,14 @@ _asyncio_Task_cancel_impl(TaskObj *self, TyObject *msg) } if (is_true) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } } self->task_must_cancel = 1; Ty_XINCREF(msg); Ty_XSETREF(self->task_cancel_msg, msg); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -2802,7 +2802,7 @@ _asyncio_Task_get_coro_impl(TaskObj *self) return Ty_NewRef(self->task_coro); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2836,7 +2836,7 @@ _asyncio_Task_get_name_impl(TaskObj *self) return Ty_NewRef(self->task_name); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2861,7 +2861,7 @@ _asyncio_Task_set_name_impl(TaskObj *self, TyObject *value) } Ty_XSETREF(self->task_name, value); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static void @@ -3055,7 +3055,7 @@ task_set_error_soon(asyncio_state *state, TaskObj *task, TyObject *et, } Ty_DECREF(e); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static inline int @@ -3153,7 +3153,7 @@ task_step_impl(asyncio_state *state, TaskObj *task, TyObject *exc) return NULL; } Ty_DECREF(tmp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (TyErr_ExceptionMatches(state->asyncio_CancelledError)) { @@ -3192,7 +3192,7 @@ task_step_impl(asyncio_state *state, TaskObj *task, TyObject *exc) Ty_DECREF(exc); - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *ret = task_step_handle_result_impl(state, task, result); @@ -3285,7 +3285,7 @@ task_step_handle_result_impl(asyncio_state *state, TaskObj *task, TyObject *resu } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Check if `result` is None */ @@ -3397,7 +3397,7 @@ task_step_handle_result_impl(asyncio_state *state, TaskObj *task, TyObject *resu } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } Ty_XDECREF(o); @@ -3625,7 +3625,7 @@ _asyncio__get_running_loop_impl(TyObject *module) TyObject *loop = Ty_XNewRef(ts->asyncio_running_loop); if (loop == NULL) { /* There's no currently running event loop */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } return loop; } @@ -3650,7 +3650,7 @@ _asyncio__set_running_loop(TyObject *module, TyObject *loop) loop = NULL; } Ty_XSETREF(ts->asyncio_running_loop, Ty_XNewRef(loop)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -3717,7 +3717,7 @@ _asyncio__register_task_impl(TyObject *module, TyObject *task) // task is an asyncio.Task instance or subclass, use efficient // linked-list implementation. register_task((TaskObj *)task); - Ty_RETURN_NONE; + Py_RETURN_NONE; } // As task does not inherit from asyncio.Task, fallback to less efficient // weakset implementation. @@ -3727,7 +3727,7 @@ _asyncio__register_task_impl(TyObject *module, TyObject *task) return NULL; } Ty_DECREF(res); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -3750,14 +3750,14 @@ _asyncio__register_eager_task_impl(TyObject *module, TyObject *task) // task is an asyncio.Task instance or subclass, use efficient // linked-list implementation. register_task((TaskObj *)task); - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (TySet_Add(state->non_asyncio_eager_tasks, task) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -3778,7 +3778,7 @@ _asyncio__unregister_task_impl(TyObject *module, TyObject *task) asyncio_state *state = get_asyncio_state(module); if (Task_Check(state, task)) { unregister_task((TaskObj *)task); - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *res = PyObject_CallMethodOneArg(state->non_asyncio_tasks, &_Ty_ID(discard), task); @@ -3786,7 +3786,7 @@ _asyncio__unregister_task_impl(TyObject *module, TyObject *task) return NULL; } Ty_DECREF(res); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -3808,14 +3808,14 @@ _asyncio__unregister_eager_task_impl(TyObject *module, TyObject *task) // task is an asyncio.Task instance or subclass, use efficient // linked-list implementation. unregister_task((TaskObj *)task); - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (TySet_Discard(state->non_asyncio_eager_tasks, task) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -3839,7 +3839,7 @@ _asyncio__enter_task_impl(TyObject *module, TyObject *loop, TyObject *task) if (enter_task(loop, task) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -3863,7 +3863,7 @@ _asyncio__leave_task_impl(TyObject *module, TyObject *loop, TyObject *task) if (leave_task(loop, task) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -3919,7 +3919,7 @@ _asyncio_current_task_impl(TyObject *module, TyObject *loop) return Ty_NewRef(ts->asyncio_running_task); } Ty_DECREF(loop); - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *ret = Ty_None; @@ -4154,7 +4154,7 @@ _asyncio_future_add_to_awaited_by_impl(TyObject *module, TyObject *fut, return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -4181,7 +4181,7 @@ _asyncio_future_discard_from_awaited_by_impl(TyObject *module, TyObject *fut, return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int diff --git a/Modules/_bisectmodule.c b/Modules/_bisectmodule.c index 1facec9..a5573ab 100644 --- a/Modules/_bisectmodule.c +++ b/Modules/_bisectmodule.c @@ -101,7 +101,7 @@ internal_bisect_right(TyObject *list, TyObject *item, Ty_ssize_t lo, Ty_ssize_t */ if (compare != NULL && Ty_IS_TYPE(litem, tp)) { // A fast path for comparing objects of the same type - TyObject *res_obj = compare(item, litem, Ty_LT); + TyObject *res_obj = compare(item, litem, Py_LT); if (res_obj == Ty_True) { Ty_DECREF(res_obj); Ty_DECREF(litem); @@ -120,7 +120,7 @@ internal_bisect_right(TyObject *list, TyObject *item, Ty_ssize_t lo, Ty_ssize_t if (res_obj == Ty_NotImplemented) { Ty_DECREF(res_obj); compare = NULL; - res = PyObject_RichCompareBool(item, litem, Ty_LT); + res = PyObject_RichCompareBool(item, litem, Py_LT); } else { res = PyObject_IsTrue(res_obj); @@ -129,7 +129,7 @@ internal_bisect_right(TyObject *list, TyObject *item, Ty_ssize_t lo, Ty_ssize_t } else { // A default path for comparing arbitrary objects - res = PyObject_RichCompareBool(item, litem, Ty_LT); + res = PyObject_RichCompareBool(item, litem, Py_LT); } if (res < 0) { goto error; @@ -230,7 +230,7 @@ _bisect_insort_right_impl(TyObject *module, TyObject *a, TyObject *x, Ty_DECREF(result); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static inline Ty_ssize_t @@ -285,7 +285,7 @@ internal_bisect_left(TyObject *list, TyObject *item, Ty_ssize_t lo, Ty_ssize_t h */ if (compare != NULL && Ty_IS_TYPE(litem, tp)) { // A fast path for comparing objects of the same type - TyObject *res_obj = compare(litem, item, Ty_LT); + TyObject *res_obj = compare(litem, item, Py_LT); if (res_obj == Ty_True) { Ty_DECREF(res_obj); Ty_DECREF(litem); @@ -304,7 +304,7 @@ internal_bisect_left(TyObject *list, TyObject *item, Ty_ssize_t lo, Ty_ssize_t h if (res_obj == Ty_NotImplemented) { Ty_DECREF(res_obj); compare = NULL; - res = PyObject_RichCompareBool(litem, item, Ty_LT); + res = PyObject_RichCompareBool(litem, item, Py_LT); } else { res = PyObject_IsTrue(res_obj); @@ -313,7 +313,7 @@ internal_bisect_left(TyObject *list, TyObject *item, Ty_ssize_t lo, Ty_ssize_t h } else { // A default path for comparing arbitrary objects - res = PyObject_RichCompareBool(litem, item, Ty_LT); + res = PyObject_RichCompareBool(litem, item, Py_LT); } if (res < 0) { goto error; @@ -415,7 +415,7 @@ _bisect_insort_left_impl(TyObject *module, TyObject *a, TyObject *x, Ty_DECREF(result); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef bisect_methods[] = { diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c index b484c17..5137641 100644 --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -725,10 +725,10 @@ PyDoc_STRVAR(BZ2Decompressor_needs_input_doc, static TyMemberDef BZ2Decompressor_members[] = { {"eof", Ty_T_BOOL, offsetof(BZ2Decompressor, eof), - Ty_READONLY, BZ2Decompressor_eof__doc__}, + Py_READONLY, BZ2Decompressor_eof__doc__}, {"unused_data", Ty_T_OBJECT_EX, offsetof(BZ2Decompressor, unused_data), - Ty_READONLY, BZ2Decompressor_unused_data__doc__}, - {"needs_input", Ty_T_BOOL, offsetof(BZ2Decompressor, needs_input), Ty_READONLY, + Py_READONLY, BZ2Decompressor_unused_data__doc__}, + {"needs_input", Ty_T_BOOL, offsetof(BZ2Decompressor, needs_input), Py_READONLY, BZ2Decompressor_needs_input_doc}, {NULL} }; diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index 8a025e5..d14992f 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -67,7 +67,7 @@ _codecs_register(TyObject *module, TyObject *search_function) if (PyCodec_Register(search_function)) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -88,7 +88,7 @@ _codecs_unregister(TyObject *module, TyObject *search_function) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -977,7 +977,7 @@ _codecs_register_error_impl(TyObject *module, const char *errors, { if (PyCodec_RegisterError(errors, handler)) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 19c3af2..0587d21 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -380,7 +380,7 @@ deque_append_impl(dequeobject *deque, TyObject *item) { if (deque_append_lock_held(deque, Ty_NewRef(item), deque->maxlen) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static inline int @@ -427,7 +427,7 @@ deque_appendleft_impl(dequeobject *deque, TyObject *item) { if (deque_appendleft_lock_held(deque, Ty_NewRef(item), deque->maxlen) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject* @@ -442,7 +442,7 @@ finalize_iterator(TyObject *it) } } Ty_DECREF(it); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Run an iterator to exhaustion. Shortcut for @@ -801,7 +801,7 @@ deque_clearmethod_impl(dequeobject *deque) /*[clinic end generated code: output=79b2513e097615c1 input=3a22e9605d20c5e9]*/ { (void)deque_clear((TyObject *)deque); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1076,7 +1076,7 @@ deque_rotate_impl(dequeobject *deque, Ty_ssize_t n) /*[clinic end generated code: output=96c2402a371eb15d input=5bf834296246e002]*/ { if (!_deque_rotate(deque, n)) - Ty_RETURN_NONE; + Py_RETURN_NONE; return NULL; } @@ -1125,7 +1125,7 @@ deque_reverse_impl(dequeobject *deque) rightindex = BLOCKLEN - 1; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1154,7 +1154,7 @@ deque_count_impl(dequeobject *deque, TyObject *v) while (--n >= 0) { CHECK_NOT_END(b); item = Ty_NewRef(b->data[index]); - cmp = PyObject_RichCompareBool(item, v, Ty_EQ); + cmp = PyObject_RichCompareBool(item, v, Py_EQ); Ty_DECREF(item); if (cmp < 0) return NULL; @@ -1189,7 +1189,7 @@ deque_contains_lock_held(dequeobject *deque, TyObject *v) while (--n >= 0) { CHECK_NOT_END(b); item = Ty_NewRef(b->data[index]); - cmp = PyObject_RichCompareBool(item, v, Ty_EQ); + cmp = PyObject_RichCompareBool(item, v, Py_EQ); Ty_DECREF(item); if (cmp) { return cmp; @@ -1285,7 +1285,7 @@ deque_index_impl(dequeobject *deque, TyObject *v, Ty_ssize_t start, while (--n >= 0) { CHECK_NOT_END(b); item = Ty_NewRef(b->data[index]); - cmp = PyObject_RichCompareBool(item, v, Ty_EQ); + cmp = PyObject_RichCompareBool(item, v, Py_EQ); Ty_DECREF(item); if (cmp > 0) return TyLong_FromSsize_t(stop - n - 1); @@ -1352,7 +1352,7 @@ deque_insert_impl(dequeobject *deque, Ty_ssize_t index, TyObject *value) Ty_DECREF(rv); if (_deque_rotate(deque, index)) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -1452,7 +1452,7 @@ deque_remove_impl(dequeobject *deque, TyObject *value) for (i = 0 ; i < n; i++) { item = Ty_NewRef(b->data[index]); - cmp = PyObject_RichCompareBool(item, value, Ty_EQ); + cmp = PyObject_RichCompareBool(item, value, Py_EQ); Ty_DECREF(item); if (cmp < 0) { return NULL; @@ -1479,7 +1479,7 @@ deque_remove_impl(dequeobject *deque, TyObject *value) if (rv == -1) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -1653,23 +1653,23 @@ deque_richcompare(TyObject *v, TyObject *w, int op) collections_state *state = find_module_state_by_def(Ty_TYPE(v)); if (!PyObject_TypeCheck(v, state->deque_type) || !PyObject_TypeCheck(w, state->deque_type)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } /* Shortcuts */ vs = Ty_SIZE(v); ws = Ty_SIZE(w); - if (op == Ty_EQ) { + if (op == Py_EQ) { if (v == w) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; if (vs != ws) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - if (op == Ty_NE) { + if (op == Py_NE) { if (v == w) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; if (vs != ws) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /* Search for the first index where items are different */ @@ -1686,7 +1686,7 @@ deque_richcompare(TyObject *v, TyObject *w, int op) y = TyIter_Next(it2); if (x == NULL || y == NULL) break; - b = PyObject_RichCompareBool(x, y, Ty_EQ); + b = PyObject_RichCompareBool(x, y, Py_EQ); if (b == 0) { cmp = PyObject_RichCompareBool(x, y, op); Ty_DECREF(x); @@ -1704,21 +1704,21 @@ deque_richcompare(TyObject *v, TyObject *w, int op) if (TyErr_Occurred()) goto done; switch (op) { - case Ty_LT: cmp = y != NULL; break; /* if w was longer */ - case Ty_LE: cmp = x == NULL; break; /* if v was not longer */ - case Ty_EQ: cmp = x == y; break; /* if we reached the end of both */ - case Ty_NE: cmp = x != y; break; /* if one deque continues */ - case Ty_GT: cmp = x != NULL; break; /* if v was longer */ - case Ty_GE: cmp = y == NULL; break; /* if w was not longer */ + case Py_LT: cmp = y != NULL; break; /* if w was longer */ + case Py_LE: cmp = x == NULL; break; /* if v was not longer */ + case Py_EQ: cmp = x == y; break; /* if we reached the end of both */ + case Py_NE: cmp = x != y; break; /* if one deque continues */ + case Py_GT: cmp = x != NULL; break; /* if v was longer */ + case Py_GE: cmp = y == NULL; break; /* if w was not longer */ } done: Ty_XDECREF(it1); Ty_XDECREF(it2); if (cmp == 1) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; if (cmp == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; return NULL; } @@ -1783,11 +1783,11 @@ deque___sizeof___impl(dequeobject *deque) } static TyObject * -deque_get_maxlen(TyObject *self, void *Ty_UNUSED(closure)) +deque_get_maxlen(TyObject *self, void *Py_UNUSED(closure)) { dequeobject *deque = dequeobject_CAST(self); if (deque->maxlen < 0) - Ty_RETURN_NONE; + Py_RETURN_NONE; return TyLong_FromSsize_t(deque->maxlen); } @@ -1843,7 +1843,7 @@ static TyMethodDef deque_methods[] = { }; static TyMemberDef deque_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(dequeobject, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(dequeobject, weakreflist), Py_READONLY}, {NULL}, }; @@ -2026,7 +2026,7 @@ dequeiter_new(TyTypeObject *type, TyObject *args, TyObject *kwds) } static TyObject * -dequeiter_len(TyObject *op, TyObject *Ty_UNUSED(dummy)) +dequeiter_len(TyObject *op, TyObject *Py_UNUSED(dummy)) { dequeiterobject *it = dequeiterobject_CAST(op); Ty_ssize_t len = FT_ATOMIC_LOAD_SSIZE(it->counter); @@ -2036,7 +2036,7 @@ dequeiter_len(TyObject *op, TyObject *Ty_UNUSED(dummy)) PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -dequeiter_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +dequeiter_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { dequeiterobject *it = dequeiterobject_CAST(op); TyTypeObject *ty = Ty_TYPE(it); @@ -2249,7 +2249,7 @@ new_defdict(TyObject *op, TyObject *arg) PyDoc_STRVAR(defdict_copy_doc, "D.copy() -> a shallow copy of D."); static TyObject * -defdict_copy(TyObject *op, TyObject *Ty_UNUSED(dummy)) +defdict_copy(TyObject *op, TyObject *Py_UNUSED(dummy)) { /* This calls the object's class. That only works for subclasses whose class constructor has the same signature. Subclasses that @@ -2259,7 +2259,7 @@ defdict_copy(TyObject *op, TyObject *Ty_UNUSED(dummy)) } static TyObject * -defdict_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +defdict_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { /* __reduce__ must return a 5-tuple as follows: @@ -2404,7 +2404,7 @@ defdict_or(TyObject* left, TyObject* right) other = left; } if (!TyDict_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } // Like copy(), this calls the object's class. // Override __or__/__ror__ for subclasses with different constructors. @@ -2624,7 +2624,7 @@ done: Ty_XDECREF(bound_get); if (TyErr_Occurred()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Helper function for namedtuple() ************************************/ @@ -2729,7 +2729,7 @@ tuplegetter_dealloc(TyObject *self) } static TyObject* -tuplegetter_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +tuplegetter_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { _tuplegetterobject *self = tuplegetterobject_CAST(op); return Ty_BuildValue("(O(nO))", (TyObject *)Ty_TYPE(self), diff --git a/Modules/_csv.c b/Modules/_csv.c index 94181ca..a490305 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -173,42 +173,42 @@ static TyObject * get_char_or_None(Ty_UCS4 c) { if (c == NOT_SET) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } else return TyUnicode_FromOrdinal(c); } static TyObject * -Dialect_get_lineterminator(TyObject *op, void *Ty_UNUSED(ignored)) +Dialect_get_lineterminator(TyObject *op, void *Py_UNUSED(ignored)) { DialectObj *self = _DialectObj_CAST(op); return Ty_XNewRef(self->lineterminator); } static TyObject * -Dialect_get_delimiter(TyObject *op, void *Ty_UNUSED(ignored)) +Dialect_get_delimiter(TyObject *op, void *Py_UNUSED(ignored)) { DialectObj *self = _DialectObj_CAST(op); return get_char_or_None(self->delimiter); } static TyObject * -Dialect_get_escapechar(TyObject *op, void *Ty_UNUSED(ignored)) +Dialect_get_escapechar(TyObject *op, void *Py_UNUSED(ignored)) { DialectObj *self = _DialectObj_CAST(op); return get_char_or_None(self->escapechar); } static TyObject * -Dialect_get_quotechar(TyObject *op, void *Ty_UNUSED(ignored)) +Dialect_get_quotechar(TyObject *op, void *Py_UNUSED(ignored)) { DialectObj *self = _DialectObj_CAST(op); return get_char_or_None(self->quotechar); } static TyObject * -Dialect_get_quoting(TyObject *op, void *Ty_UNUSED(ignored)) +Dialect_get_quoting(TyObject *op, void *Py_UNUSED(ignored)) { DialectObj *self = _DialectObj_CAST(op); return TyLong_FromLong(self->quoting); @@ -371,9 +371,9 @@ dialect_check_chars(const char *name1, const char *name2, Ty_UCS4 c1, Ty_UCS4 c2 #define D_OFF(x) offsetof(DialectObj, x) static struct TyMemberDef Dialect_memberlist[] = { - { "skipinitialspace", Ty_T_BOOL, D_OFF(skipinitialspace), Ty_READONLY }, - { "doublequote", Ty_T_BOOL, D_OFF(doublequote), Ty_READONLY }, - { "strict", Ty_T_BOOL, D_OFF(strict), Ty_READONLY }, + { "skipinitialspace", Ty_T_BOOL, D_OFF(skipinitialspace), Py_READONLY }, + { "doublequote", Ty_T_BOOL, D_OFF(doublequote), Py_READONLY }, + { "strict", Ty_T_BOOL, D_OFF(strict), Py_READONLY }, { NULL } }; @@ -1034,8 +1034,8 @@ static struct TyMethodDef Reader_methods[] = { #define R_OFF(x) offsetof(ReaderObj, x) static struct TyMemberDef Reader_memberlist[] = { - { "dialect", _Ty_T_OBJECT, R_OFF(dialect), Ty_READONLY }, - { "line_num", Ty_T_ULONG, R_OFF(line_num), Ty_READONLY }, + { "dialect", _Ty_T_OBJECT, R_OFF(dialect), Py_READONLY }, + { "line_num", Ty_T_ULONG, R_OFF(line_num), Py_READONLY }, { NULL } }; @@ -1441,7 +1441,7 @@ csv_writerows(TyObject *self, TyObject *seqseq) Ty_DECREF(row_iter); if (TyErr_Occurred()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static struct TyMethodDef Writer_methods[] = { @@ -1453,7 +1453,7 @@ static struct TyMethodDef Writer_methods[] = { #define W_OFF(x) offsetof(WriterObj, x) static struct TyMemberDef Writer_memberlist[] = { - { "dialect", _Ty_T_OBJECT, W_OFF(dialect), Ty_READONLY }, + { "dialect", _Ty_T_OBJECT, W_OFF(dialect), Py_READONLY }, { NULL } }; @@ -1607,7 +1607,7 @@ csv_register_dialect(TyObject *module, TyObject *args, TyObject *kwargs) return NULL; } Ty_DECREF(dialect); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1634,7 +1634,7 @@ _csv_unregister_dialect_impl(TyObject *module, TyObject *name) TyErr_Format(module_state->error_obj, "unknown dialect"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 24fc62e..67aafe2 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -192,7 +192,7 @@ _DictRemover_call(TyObject *myself, TyObject *args, TyObject *kw) Ty_CLEAR(self->key); Ty_CLEAR(self->dict); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(dictremover_doc, "deletes a key from a dictionary"); @@ -577,7 +577,7 @@ _ctypes_CType_Type___sizeof___impl(TyObject *self, TyTypeObject *cls) } static TyObject * -ctype_get_pointer_type(TyObject *self, void *Ty_UNUSED(ignored)) +ctype_get_pointer_type(TyObject *self, void *Py_UNUSED(ignored)) { ctypes_state *st = get_module_state_by_def(Ty_TYPE(self)); StgInfo *info; @@ -600,7 +600,7 @@ ctype_get_pointer_type(TyObject *self, void *Ty_UNUSED(ignored)) } static int -ctype_set_pointer_type(TyObject *self, TyObject *tp, void *Ty_UNUSED(ignored)) +ctype_set_pointer_type(TyObject *self, TyObject *tp, void *Py_UNUSED(ignored)) { ctypes_state *st = get_module_state_by_def(Ty_TYPE(self)); StgInfo *info; @@ -1373,7 +1373,7 @@ PyCPointerType_set_type_impl(TyTypeObject *self, TyTypeObject *cls, if (PyObject_SetAttr((TyObject *)self, &_Ty_ID(_type_), type) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject *_byref(ctypes_state *, TyObject *); @@ -1617,7 +1617,7 @@ WCharArray_get_value_lock_held(TyObject *op) } static TyObject * -WCharArray_get_value(TyObject *op, void *Ty_UNUSED(ignored)) +WCharArray_get_value(TyObject *op, void *Py_UNUSED(ignored)) { TyObject *res; Ty_BEGIN_CRITICAL_SECTION(op); @@ -1662,7 +1662,7 @@ WCharArray_set_value_lock_held(TyObject *op, TyObject *value) } static int -WCharArray_set_value(TyObject *op, TyObject *value, void *Ty_UNUSED(ignored)) +WCharArray_set_value(TyObject *op, TyObject *value, void *Py_UNUSED(ignored)) { int rc; Ty_BEGIN_CRITICAL_SECTION(op); @@ -1904,7 +1904,7 @@ c_wchar_p_from_param_impl(TyObject *type, TyTypeObject *cls, TyObject *value) TyObject *as_parameter; int res; if (value == Ty_None) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } ctypes_state *st = get_module_state_by_class(cls->tp_base); if (TyUnicode_Check(value)) { @@ -1993,7 +1993,7 @@ c_char_p_from_param_impl(TyObject *type, TyTypeObject *cls, TyObject *value) TyObject *as_parameter; int res; if (value == Ty_None) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } ctypes_state *st = get_module_state_by_class(cls->tp_base); if (TyBytes_Check(value)) { @@ -2084,7 +2084,7 @@ c_void_p_from_param_impl(TyObject *type, TyTypeObject *cls, TyObject *value) /* None */ if (value == Ty_None) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } ctypes_state *st = get_module_state_by_class(cls->tp_base); @@ -3039,13 +3039,13 @@ PyCData_dealloc(TyObject *self) static TyMemberDef PyCData_members[] = { { "_b_base_", _Py_T_OBJECT, - offsetof(CDataObject, b_base), Ty_READONLY, + offsetof(CDataObject, b_base), Py_READONLY, "the base object" }, { "_b_needsfree_", Ty_T_INT, - offsetof(CDataObject, b_needsfree), Ty_READONLY, + offsetof(CDataObject, b_needsfree), Py_READONLY, "whether the object owns the memory or not" }, { "_objects", _Py_T_OBJECT, - offsetof(CDataObject, b_objects), Ty_READONLY, + offsetof(CDataObject, b_objects), Py_READONLY, "internal objects tree (NEVER CHANGE THIS OBJECT!)"}, { NULL }, }; @@ -3195,7 +3195,7 @@ _ctypes_PyCData___setstate___impl(TyObject *myself, TyObject *dict, Ty_DECREF(mydict); if (res == -1) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -3442,7 +3442,7 @@ _PyCData_set(ctypes_state *st, return result; } else if (value == Ty_None && PyCPointerTypeObject_Check(st, type)) { *(void **)ptr = NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } else { TyErr_Format(TyExc_TypeError, "expected %s instance, got %s", @@ -3665,7 +3665,7 @@ _ctypes_CFuncPtr_errcheck_get_impl(PyCFuncPtrObject *self) if (self->errcheck) { return Ty_NewRef(self->errcheck); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -3727,7 +3727,7 @@ _ctypes_CFuncPtr_restype_get_impl(PyCFuncPtrObject *self) if (info->restype) { return Ty_NewRef(info->restype); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -3782,7 +3782,7 @@ _ctypes_CFuncPtr_argtypes_get_impl(PyCFuncPtrObject *self) if (info->argtypes) { return Ty_NewRef(info->argtypes); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c index 52461b1..2fb9c91 100644 --- a/Modules/_ctypes/_ctypes_test.c +++ b/Modules/_ctypes/_ctypes_test.c @@ -735,7 +735,7 @@ TyObject *py_func_si(TyObject *self, TyObject *args) int i; if (!TyArg_ParseTuple(args, "si", &name, &i)) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } EXPORT(void) _py_func_si(char *s, int i) @@ -744,7 +744,7 @@ EXPORT(void) _py_func_si(char *s, int i) TyObject *py_func(TyObject *self, TyObject *args) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } EXPORT(void) _py_func(void) diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 15e651e..1fe58db 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -587,7 +587,7 @@ PyCArg_repr(TyObject *op) static TyMemberDef PyCArgType_members[] = { { "_obj", _Py_T_OBJECT, - offsetof(PyCArgObject, obj), Ty_READONLY, + offsetof(PyCArgObject, obj), Py_READONLY, "the wrapped object" }, { NULL }, }; @@ -1005,7 +1005,7 @@ static TyObject *GetResult(ctypes_state *st, return TyLong_FromLong(*(int *)result); if (restype == Ty_None) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } StgInfo *info; @@ -1468,7 +1468,7 @@ static TyObject *free_library(TyObject *self, TyObject *args) if (!result) { return TyErr_SetFromWindowsErr(err); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(copy_com_pointer_doc, @@ -1547,7 +1547,7 @@ static TyObject *py_dyld_shared_cache_contains_path(TyObject *self, TyObject *ar return NULL; if (name == Ty_None) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; if (TyUnicode_FSConverter(name, &name2) == 0) return NULL; @@ -1557,9 +1557,9 @@ static TyObject *py_dyld_shared_cache_contains_path(TyObject *self, TyObject *ar Ty_DECREF(name2); if (r) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } else { @@ -1624,7 +1624,7 @@ static TyObject *py_dl_close(TyObject *self, TyObject *args) TyErr_SetString(TyExc_OSError, "dlclose() error"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject *py_dl_sym(TyObject *self, TyObject *args) @@ -1934,7 +1934,7 @@ _ctypes_resize_impl(TyObject *module, CDataObject *obj, Ty_ssize_t size) obj->b_size = size; } done: - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index d81ab8f..eb642a5 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -301,14 +301,14 @@ PyCField_get(TyObject *op, TyObject *inst, TyObject *type) } static TyObject * -PyCField_get_legacy_size(TyObject *self, void *Ty_UNUSED(closure)) +PyCField_get_legacy_size(TyObject *self, void *Py_UNUSED(closure)) { CFieldObject *field = _CFieldObject_CAST(self); return TyLong_FromSsize_t(_pack_legacy_size(field)); } static TyObject * -PyCField_get_bit_size(TyObject *self, void *Ty_UNUSED(closure)) +PyCField_get_bit_size(TyObject *self, void *Py_UNUSED(closure)) { CFieldObject *field = _CFieldObject_CAST(self); if (field->bitfield_size) { @@ -340,13 +340,13 @@ finally: } static TyObject * -PyCField_is_bitfield(TyObject *self, void *Ty_UNUSED(closure)) +PyCField_is_bitfield(TyObject *self, void *Py_UNUSED(closure)) { return TyBool_FromLong(_CFieldObject_CAST(self)->bitfield_size); } static TyObject * -PyCField_is_anonymous(TyObject *self, void *Ty_UNUSED(closure)) +PyCField_is_anonymous(TyObject *self, void *Py_UNUSED(closure)) { return TyBool_FromLong(_CFieldObject_CAST(self)->anonymous); } @@ -369,34 +369,34 @@ static TyMemberDef PyCField_members[] = { { "name", .type = Ty_T_OBJECT_EX, .offset = offsetof(CFieldObject, name), - .flags = Ty_READONLY, + .flags = Py_READONLY, .doc = PyDoc_STR("name of this field") }, { "type", .type = Ty_T_OBJECT_EX, .offset = offsetof(CFieldObject, proto), - .flags = Ty_READONLY, + .flags = Py_READONLY, .doc = PyDoc_STR("type of this field") }, { "offset", .type = Ty_T_PYSSIZET, .offset = offsetof(CFieldObject, byte_offset), - .flags = Ty_READONLY, + .flags = Py_READONLY, .doc = PyDoc_STR( "offset in bytes of this field (same as byte_offset)") }, { "byte_offset", .type = Ty_T_PYSSIZET, .offset = offsetof(CFieldObject, byte_offset), - .flags = Ty_READONLY, + .flags = Py_READONLY, .doc = PyDoc_STR("offset in bytes of this field. " "For bitfields: excludes bit_offset.") }, { "byte_size", .type = Ty_T_PYSSIZET, .offset = offsetof(CFieldObject, byte_size), - .flags = Ty_READONLY, + .flags = Py_READONLY, .doc = PyDoc_STR("size of this field in bytes") }, { "bit_offset", .type = Ty_T_UBYTE, .offset = offsetof(CFieldObject, bit_offset), - .flags = Ty_READONLY, + .flags = Py_READONLY, .doc = PyDoc_STR("additional offset in bits (relative to byte_offset);" " zero for non-bitfields") }, { NULL }, @@ -527,7 +527,7 @@ Ty_ssize_t NUM_BITS(Ty_ssize_t bitsize) { #ifdef _CTYPES_DEBUG_KEEP #define _RET(x) Ty_INCREF(x); return x #else -#define _RET(X) Ty_RETURN_NONE +#define _RET(X) Py_RETURN_NONE #endif /***************************************************************** @@ -1202,7 +1202,7 @@ z_get(void *ptr, Ty_ssize_t size) return TyBytes_FromStringAndSize(*(char **)ptr, strlen(*(char **)ptr)); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -1224,7 +1224,7 @@ Z_set(void *ptr, TyObject *value, Ty_ssize_t size) #else *(wchar_t **)ptr = (wchar_t *)TyLong_AsUnsignedLongMask(value); #endif - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (!TyUnicode_Check(value)) { TyErr_Format(TyExc_TypeError, @@ -1255,7 +1255,7 @@ Z_get(void *ptr, Ty_ssize_t size) if (p) { return TyUnicode_FromWideChar(p, wcslen(p)); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -1317,7 +1317,7 @@ X_get(void *ptr, Ty_ssize_t size) /* Hm, it seems NULL pointer and zero length string are the same in BSTR, see Don Box, p 81 */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } } #endif @@ -1360,7 +1360,7 @@ P_get(void *ptr, Ty_ssize_t size) { assert(NUM_BITS(size) || (size == sizeof(void *))); if (*(void **)ptr == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyLong_FromVoidPtr(*(void **)ptr); } diff --git a/Modules/_ctypes/clinic/_ctypes.c.h b/Modules/_ctypes/clinic/_ctypes.c.h index 7d02469..929355e 100644 --- a/Modules/_ctypes/clinic/_ctypes.c.h +++ b/Modules/_ctypes/clinic/_ctypes.c.h @@ -421,7 +421,7 @@ static int _ctypes_PyCArrayType_Type_raw_set_impl(CDataObject *self, TyObject *value); static int -_ctypes_PyCArrayType_Type_raw_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ctypes_PyCArrayType_Type_raw_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -446,7 +446,7 @@ static TyObject * _ctypes_PyCArrayType_Type_raw_get_impl(CDataObject *self); static TyObject * -_ctypes_PyCArrayType_Type_raw_get(TyObject *self, void *Ty_UNUSED(context)) +_ctypes_PyCArrayType_Type_raw_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -471,7 +471,7 @@ static TyObject * _ctypes_PyCArrayType_Type_value_get_impl(CDataObject *self); static TyObject * -_ctypes_PyCArrayType_Type_value_get(TyObject *self, void *Ty_UNUSED(context)) +_ctypes_PyCArrayType_Type_value_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -496,7 +496,7 @@ static int _ctypes_PyCArrayType_Type_value_set_impl(CDataObject *self, TyObject *value); static int -_ctypes_PyCArrayType_Type_value_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ctypes_PyCArrayType_Type_value_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -754,7 +754,7 @@ static TyObject * _ctypes_PyCData___ctypes_from_outparam___impl(TyObject *self); static TyObject * -_ctypes_PyCData___ctypes_from_outparam__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ctypes_PyCData___ctypes_from_outparam__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _ctypes_PyCData___ctypes_from_outparam___impl(self); } @@ -773,7 +773,7 @@ static int _ctypes_CFuncPtr_errcheck_set_impl(PyCFuncPtrObject *self, TyObject *value); static int -_ctypes_CFuncPtr_errcheck_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ctypes_CFuncPtr_errcheck_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -805,7 +805,7 @@ static TyObject * _ctypes_CFuncPtr_errcheck_get_impl(PyCFuncPtrObject *self); static TyObject * -_ctypes_CFuncPtr_errcheck_get(TyObject *self, void *Ty_UNUSED(context)) +_ctypes_CFuncPtr_errcheck_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -830,7 +830,7 @@ static int _ctypes_CFuncPtr_restype_set_impl(PyCFuncPtrObject *self, TyObject *value); static int -_ctypes_CFuncPtr_restype_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ctypes_CFuncPtr_restype_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -862,7 +862,7 @@ static TyObject * _ctypes_CFuncPtr_restype_get_impl(PyCFuncPtrObject *self); static TyObject * -_ctypes_CFuncPtr_restype_get(TyObject *self, void *Ty_UNUSED(context)) +_ctypes_CFuncPtr_restype_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -887,7 +887,7 @@ static int _ctypes_CFuncPtr_argtypes_set_impl(PyCFuncPtrObject *self, TyObject *value); static int -_ctypes_CFuncPtr_argtypes_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ctypes_CFuncPtr_argtypes_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -919,7 +919,7 @@ static TyObject * _ctypes_CFuncPtr_argtypes_get_impl(PyCFuncPtrObject *self); static TyObject * -_ctypes_CFuncPtr_argtypes_get(TyObject *self, void *Ty_UNUSED(context)) +_ctypes_CFuncPtr_argtypes_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -944,7 +944,7 @@ static int _ctypes_Simple_value_set_impl(CDataObject *self, TyObject *value); static int -_ctypes_Simple_value_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ctypes_Simple_value_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -969,7 +969,7 @@ static TyObject * _ctypes_Simple_value_get_impl(CDataObject *self); static TyObject * -_ctypes_Simple_value_get(TyObject *self, void *Ty_UNUSED(context)) +_ctypes_Simple_value_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c index ef42de1..56e0a82 100644 --- a/Modules/_curses_panel.c +++ b/Modules/_curses_panel.c @@ -76,7 +76,7 @@ static TyObject * PyCursesCheckERR(_curses_panel_state *state, int code, const char *fname) { if (code != ERR) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } else { if (fname == NULL) { @@ -318,7 +318,7 @@ _curses_panel_panel_above_impl(PyCursesPanelObject *self) if (pan == NULL) { /* valid output, it means the calling panel is on top of the stack */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } po = find_po(pan); if (po == NULL) { @@ -348,7 +348,7 @@ _curses_panel_panel_below_impl(PyCursesPanelObject *self) if (pan == NULL) { /* valid output, it means the calling panel is on the bottom of the stack */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } po = find_po(pan); if (po == NULL) { @@ -370,9 +370,9 @@ _curses_panel_panel_hidden_impl(PyCursesPanelObject *self) /*[clinic end generated code: output=66eebd1ab4501a71 input=453d4b4fce25e21a]*/ { if (panel_hidden(self->pan)) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; else - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /*[clinic input] @@ -439,7 +439,7 @@ _curses_panel_panel_replace_impl(PyCursesPanelObject *self, return NULL; } Ty_SETREF(po->wo, (PyCursesWindowObject*)Ty_NewRef(win)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -555,7 +555,7 @@ _curses_panel_bottom_panel_impl(TyObject *module) if (pan == NULL) { /* valid output, it means there's no panel at all */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } po = find_po(pan); if (po == NULL) { @@ -613,7 +613,7 @@ _curses_panel_top_panel_impl(TyObject *module) if (pan == NULL) { /* valid output, it means there's no panel at all */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } po = find_po(pan); if (po == NULL) { @@ -638,7 +638,7 @@ _curses_panel_update_panels_impl(TyObject *module) { PyCursesInitialised; update_panels(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* List of functions defined in the module */ diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 088e49a..2540484 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -1509,7 +1509,7 @@ call_tzinfo_method(TyObject *tzinfo, const char *name, TyObject *tzinfoarg) assert(tzinfoarg != NULL); if (tzinfo == Ty_None) - Ty_RETURN_NONE; + Py_RETURN_NONE; offset = PyObject_CallMethod(tzinfo, name, "O", tzinfoarg); if (offset == Ty_None || offset == NULL) return offset; @@ -1580,7 +1580,7 @@ call_tzname(TyObject *tzinfo, TyObject *tzinfoarg) assert(tzinfoarg != NULL); if (tzinfo == Ty_None) - Ty_RETURN_NONE; + Py_RETURN_NONE; result = PyObject_CallMethodOneArg(tzinfo, &_Ty_ID(tzname), tzinfoarg); @@ -2078,7 +2078,7 @@ build_struct_time(int y, int m, int d, int hh, int mm, int ss, int dstflag) static TyObject * diff_to_bool(int diff, int op) { - Ty_RETURN_RICHCOMPARE(diff, 0, op); + Py_RETURN_RICHCOMPARE(diff, 0, op); } /* --------------------------------------------------------------------------- @@ -2507,7 +2507,7 @@ delta_richcompare(TyObject *self, TyObject *other, int op) return diff_to_bool(diff, op); } else { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } } @@ -2607,7 +2607,7 @@ delta_remainder(TyObject *left, TyObject *right) TyObject *remainder; if (!PyDelta_Check(left) || !PyDelta_Check(right)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; pyus_left = delta_to_microseconds((PyDateTime_Delta *)left); if (pyus_left == NULL) @@ -2643,7 +2643,7 @@ delta_divmod(TyObject *left, TyObject *right) TyObject *result; if (!PyDelta_Check(left) || !PyDelta_Check(right)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; pyus_left = delta_to_microseconds((PyDateTime_Delta *)left); if (pyus_left == NULL) @@ -2977,7 +2977,7 @@ delta_getstate(PyDateTime_Delta *self) } static TyObject * -delta_total_seconds(TyObject *op, TyObject *Ty_UNUSED(dummy)) +delta_total_seconds(TyObject *op, TyObject *Py_UNUSED(dummy)) { TyObject *total_seconds; TyObject *total_microseconds; @@ -2997,7 +2997,7 @@ delta_total_seconds(TyObject *op, TyObject *Ty_UNUSED(dummy)) } static TyObject * -delta_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +delta_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_Delta *self = PyDelta_CAST(op); return Ty_BuildValue("ON", Ty_TYPE(self), delta_getstate(self)); @@ -3007,13 +3007,13 @@ delta_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) static TyMemberDef delta_members[] = { - {"days", Ty_T_INT, OFFSET(days), Ty_READONLY, + {"days", Ty_T_INT, OFFSET(days), Py_READONLY, PyDoc_STR("Number of days.")}, - {"seconds", Ty_T_INT, OFFSET(seconds), Ty_READONLY, + {"seconds", Ty_T_INT, OFFSET(seconds), Py_READONLY, PyDoc_STR("Number of seconds (>= 0 and less than 1 day).")}, - {"microseconds", Ty_T_INT, OFFSET(microseconds), Ty_READONLY, + {"microseconds", Ty_T_INT, OFFSET(microseconds), Py_READONLY, PyDoc_STR("Number of microseconds (>= 0 and less than 1 second).")}, {NULL} }; @@ -3139,21 +3139,21 @@ look_up_delta(int days, int seconds, int microseconds, TyTypeObject *type) /* Accessor properties. */ static TyObject * -date_year(TyObject *op, void *Ty_UNUSED(closure)) +date_year(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_Date *self = PyDate_CAST(op); return TyLong_FromLong(GET_YEAR(self)); } static TyObject * -date_month(TyObject *op, void *Ty_UNUSED(closure)) +date_month(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_Date *self = PyDate_CAST(op); return TyLong_FromLong(GET_MONTH(self)); } static TyObject * -date_day(TyObject *op, void *Ty_UNUSED(closure)) +date_day(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_Date *self = PyDate_CAST(op); return TyLong_FromLong(GET_DAY(self)); @@ -3255,7 +3255,7 @@ date_fromtimestamp(TyObject *cls, TyObject *obj) * generally the same as calling C's time. */ static TyObject * -date_today(TyObject *cls, TyObject *Ty_UNUSED(dummy)) +date_today(TyObject *cls, TyObject *Py_UNUSED(dummy)) { TyObject *time; TyObject *result; @@ -3468,7 +3468,7 @@ static TyObject * date_add(TyObject *left, TyObject *right) { if (PyDateTime_Check(left) || PyDateTime_Check(right)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; if (PyDate_Check(left)) { /* date + ??? */ @@ -3488,14 +3488,14 @@ date_add(TyObject *left, TyObject *right) (PyDateTime_Delta *) left, 0); } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } static TyObject * date_subtract(TyObject *left, TyObject *right) { if (PyDateTime_Check(left) || PyDateTime_Check(right)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; if (PyDate_Check(left)) { if (PyDate_Check(right)) { @@ -3515,7 +3515,7 @@ date_subtract(TyObject *left, TyObject *right) 1); } } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } @@ -3531,7 +3531,7 @@ date_repr(TyObject *op) } static TyObject * -date_isoformat(TyObject *op, TyObject *Ty_UNUSED(dummy)) +date_isoformat(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_Date *self = PyDate_CAST(op); return TyUnicode_FromFormat("%04d-%02d-%02d", @@ -3547,7 +3547,7 @@ date_str(TyObject *self) static TyObject * -date_ctime(TyObject *self, TyObject *Ty_UNUSED(dummy)) +date_ctime(TyObject *self, TyObject *Py_UNUSED(dummy)) { return format_ctime(self, 0, 0, 0); } @@ -3593,7 +3593,7 @@ date_format(TyObject *self, TyObject *args) /* ISO methods. */ static TyObject * -date_isoweekday(TyObject *self, TyObject *Ty_UNUSED(dummy)) +date_isoweekday(TyObject *self, TyObject *Py_UNUSED(dummy)) { int dow = weekday(GET_YEAR(self), GET_MONTH(self), GET_DAY(self)); @@ -3631,7 +3631,7 @@ iso_calendar_date_repr(TyObject *self) } static TyObject * -iso_calendar_date_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +iso_calendar_date_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { // Construct the tuple that this reduces to TyObject *reduce_tuple = Ty_BuildValue( @@ -3645,7 +3645,7 @@ iso_calendar_date_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -iso_calendar_date_year(TyObject *self, void *Ty_UNUSED(closure)) +iso_calendar_date_year(TyObject *self, void *Py_UNUSED(closure)) { TyObject *year = TyTuple_GetItem(self, 0); if (year == NULL) { @@ -3655,7 +3655,7 @@ iso_calendar_date_year(TyObject *self, void *Ty_UNUSED(closure)) } static TyObject * -iso_calendar_date_week(TyObject *self, void *Ty_UNUSED(closure)) +iso_calendar_date_week(TyObject *self, void *Py_UNUSED(closure)) { TyObject *week = TyTuple_GetItem(self, 1); if (week == NULL) { @@ -3665,7 +3665,7 @@ iso_calendar_date_week(TyObject *self, void *Ty_UNUSED(closure)) } static TyObject * -iso_calendar_date_weekday(TyObject *self, void *Ty_UNUSED(closure)) +iso_calendar_date_weekday(TyObject *self, void *Py_UNUSED(closure)) { TyObject *weekday = TyTuple_GetItem(self, 2); if (weekday == NULL) { @@ -3750,7 +3750,7 @@ iso_calendar_date_new_impl(TyTypeObject *type, int year, int week, } static TyObject * -date_isocalendar(TyObject *self, TyObject *Ty_UNUSED(dummy)) +date_isocalendar(TyObject *self, TyObject *Py_UNUSED(dummy)) { int year = GET_YEAR(self); int week1_monday = iso_week1_monday(year); @@ -3801,11 +3801,11 @@ date_richcompare(TyObject *self, TyObject *other, int op) return diff_to_bool(diff, op); } else - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } static TyObject * -date_timetuple(TyObject *self, TyObject *Ty_UNUSED(dummy)) +date_timetuple(TyObject *self, TyObject *Py_UNUSED(dummy)) { return build_struct_time(GET_YEAR(self), GET_MONTH(self), @@ -3853,14 +3853,14 @@ date_hash(TyObject *op) } static TyObject * -date_toordinal(TyObject *self, TyObject *Ty_UNUSED(dummy)) +date_toordinal(TyObject *self, TyObject *Py_UNUSED(dummy)) { return TyLong_FromLong(ymd_to_ord(GET_YEAR(self), GET_MONTH(self), GET_DAY(self))); } static TyObject * -date_weekday(TyObject *self, TyObject *Ty_UNUSED(dummy)) +date_weekday(TyObject *self, TyObject *Py_UNUSED(dummy)) { int dow = weekday(GET_YEAR(self), GET_MONTH(self), GET_DAY(self)); return TyLong_FromLong(dow); @@ -3879,7 +3879,7 @@ date_getstate(PyDateTime_Date *self) } static TyObject * -date_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +date_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_Date *self = PyDate_CAST(op); return Ty_BuildValue("(ON)", Ty_TYPE(self), date_getstate(self)); @@ -4042,19 +4042,19 @@ tzinfo_nogo(const char* methodname) /* Methods. A subclass must implement these. */ static TyObject * -tzinfo_tzname(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(dt)) +tzinfo_tzname(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(dt)) { return tzinfo_nogo("tzname"); } static TyObject * -tzinfo_utcoffset(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(dt)) +tzinfo_utcoffset(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(dt)) { return tzinfo_nogo("utcoffset"); } static TyObject * -tzinfo_dst(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(dt)) +tzinfo_dst(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(dt)) { return tzinfo_nogo("dst"); } @@ -4145,7 +4145,7 @@ Fail: */ static TyObject * -tzinfo_reduce(TyObject *self, TyObject *Ty_UNUSED(dummy)) +tzinfo_reduce(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *args, *state; TyObject *getinitargs; @@ -4265,10 +4265,10 @@ timezone_dealloc(TyObject *op) static TyObject * timezone_richcompare(TyObject *self, TyObject *other, int op) { - if (op != Ty_EQ && op != Ty_NE) - Ty_RETURN_NOTIMPLEMENTED; + if (op != Py_EQ && op != Py_NE) + Py_RETURN_NOTIMPLEMENTED; if (!PyTimezone_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } PyDateTime_TimeZone *lhs = PyTimeZone_CAST(self); PyDateTime_TimeZone *rhs = PyTimeZone_CAST(other); @@ -4387,7 +4387,7 @@ timezone_dst(TyObject *op, TyObject *dt) if (_timezone_check_argument(dt, "dst") == -1) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -4410,7 +4410,7 @@ timezone_fromutc(TyObject *op, TyObject *arg) } static TyObject * -timezone_getinitargs(TyObject *op, TyObject *Ty_UNUSED(dummy)) +timezone_getinitargs(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_TimeZone *self = PyTimeZone_CAST(op); if (self->name == NULL) @@ -4507,14 +4507,14 @@ look_up_timezone(TyObject *offset, TyObject *name) */ static TyObject * -time_hour(TyObject *op, void *Ty_UNUSED(closure)) +time_hour(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_Time *self = PyTime_CAST(op); return TyLong_FromLong(TIME_GET_HOUR(self)); } static TyObject * -time_minute(TyObject *op, void *Ty_UNUSED(closure)) +time_minute(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_Time *self = PyTime_CAST(op); return TyLong_FromLong(TIME_GET_MINUTE(self)); @@ -4522,21 +4522,21 @@ time_minute(TyObject *op, void *Ty_UNUSED(closure)) /* The name time_second conflicted with some platform header file. */ static TyObject * -py_time_second(TyObject *op, void *Ty_UNUSED(closure)) +py_time_second(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_Time *self = PyTime_CAST(op); return TyLong_FromLong(TIME_GET_SECOND(self)); } static TyObject * -time_microsecond(TyObject *op, void *Ty_UNUSED(closure)) +time_microsecond(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_Time *self = PyTime_CAST(op); return TyLong_FromLong(TIME_GET_MICROSECOND(self)); } static TyObject * -time_tzinfo(TyObject *op, void *Ty_UNUSED(closure)) +time_tzinfo(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_Time *self = PyTime_CAST(op); TyObject *result = HASTZINFO(self) ? self->tzinfo : Ty_None; @@ -4544,7 +4544,7 @@ time_tzinfo(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -time_fold(TyObject *op, void *Ty_UNUSED(closure)) +time_fold(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_Time *self = PyTime_CAST(op); return TyLong_FromLong(TIME_GET_FOLD(self)); @@ -4696,19 +4696,19 @@ time_dealloc(TyObject *op) /* These are all METH_NOARGS, so don't need to check the arglist. */ static TyObject * -time_utcoffset(TyObject *op, TyObject *Ty_UNUSED(dummy)) { +time_utcoffset(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_Time *self = PyTime_CAST(op); return call_utcoffset(GET_TIME_TZINFO(self), Ty_None); } static TyObject * -time_dst(TyObject *op, TyObject *Ty_UNUSED(dummy)) { +time_dst(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_Time *self = PyTime_CAST(op); return call_dst(GET_TIME_TZINFO(self), Ty_None); } static TyObject * -time_tzname(TyObject *op, TyObject *Ty_UNUSED(dummy)) { +time_tzname(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_Time *self = PyTime_CAST(op); return call_tzname(GET_TIME_TZINFO(self), Ty_None); } @@ -4861,7 +4861,7 @@ time_richcompare(TyObject *self, TyObject *other, int op) int diff; if (! PyTime_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; if (GET_TIME_TZINFO(self) == GET_TIME_TZINFO(other)) { diff = memcmp(((PyDateTime_Time *)self)->data, @@ -4907,10 +4907,10 @@ time_richcompare(TyObject *self, TyObject *other, int op) TIME_GET_MICROSECOND(other); result = diff_to_bool(diff, op); } - else if (op == Ty_EQ) { + else if (op == Py_EQ) { result = Ty_NewRef(Ty_False); } - else if (op == Ty_NE) { + else if (op == Py_NE) { result = Ty_NewRef(Ty_True); } else { @@ -5114,7 +5114,7 @@ time_reduce_ex(TyObject *op, TyObject *args) } static TyObject * -time_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +time_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_Time *self = PyTime_CAST(op); return Ty_BuildValue("(ON)", Ty_TYPE(self), time_getstate(self, 2)); @@ -5228,35 +5228,35 @@ static TyTypeObject PyDateTime_TimeType = { */ static TyObject * -datetime_hour(TyObject *op, void *Ty_UNUSED(closure)) +datetime_hour(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return TyLong_FromLong(DATE_GET_HOUR(self)); } static TyObject * -datetime_minute(TyObject *op, void *Ty_UNUSED(closure)) +datetime_minute(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return TyLong_FromLong(DATE_GET_MINUTE(self)); } static TyObject * -datetime_second(TyObject *op, void *Ty_UNUSED(closure)) +datetime_second(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return TyLong_FromLong(DATE_GET_SECOND(self)); } static TyObject * -datetime_microsecond(TyObject *op, void *Ty_UNUSED(closure)) +datetime_microsecond(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return TyLong_FromLong(DATE_GET_MICROSECOND(self)); } static TyObject * -datetime_tzinfo(TyObject *op, void *Ty_UNUSED(closure)) +datetime_tzinfo(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); TyObject *result = HASTZINFO(self) ? self->tzinfo : Ty_None; @@ -5264,7 +5264,7 @@ datetime_tzinfo(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -datetime_fold(TyObject *op, void *Ty_UNUSED(closure)) +datetime_fold(TyObject *op, void *Py_UNUSED(closure)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return TyLong_FromLong(DATE_GET_FOLD(self)); @@ -5995,19 +5995,19 @@ datetime_dealloc(TyObject *op) /* These are all METH_NOARGS, so don't need to check the arglist. */ static TyObject * -datetime_utcoffset(TyObject *op, TyObject *Ty_UNUSED(dummy)) { +datetime_utcoffset(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return call_utcoffset(GET_DT_TZINFO(self), op); } static TyObject * -datetime_dst(TyObject *op, TyObject *Ty_UNUSED(dummy)) { +datetime_dst(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return call_dst(GET_DT_TZINFO(self), op); } static TyObject * -datetime_tzname(TyObject *op, TyObject *Ty_UNUSED(dummy)) { +datetime_tzname(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return call_tzname(GET_DT_TZINFO(self), op); } @@ -6065,7 +6065,7 @@ datetime_add(TyObject *left, TyObject *right) (PyDateTime_Delta *) left, 1); } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } static TyObject * @@ -6275,7 +6275,7 @@ datetime_isoformat(TyObject *op, TyObject *args, TyObject *kw) } static TyObject * -datetime_ctime(TyObject *op, TyObject *Ty_UNUSED(dummy)) +datetime_ctime(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return format_ctime(op, @@ -6358,7 +6358,7 @@ datetime_richcompare(TyObject *self, TyObject *other, int op) int diff; if (!PyDateTime_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } if (GET_DT_TZINFO(self) == GET_DT_TZINFO(other)) { @@ -6383,7 +6383,7 @@ datetime_richcompare(TyObject *self, TyObject *other, int op) diff = memcmp(((PyDateTime_DateTime *)self)->data, ((PyDateTime_DateTime *)other)->data, _PyDateTime_DATETIME_DATASIZE); - if ((op == Ty_EQ || op == Ty_NE) && diff == 0) { + if ((op == Py_EQ || op == Py_NE) && diff == 0) { int ex = pep495_eq_exception(self, other, offset1, offset2); if (ex == -1) goto done; @@ -6405,7 +6405,7 @@ datetime_richcompare(TyObject *self, TyObject *other, int op) diff = GET_TD_SECONDS(delta) | GET_TD_MICROSECONDS(delta); Ty_DECREF(delta); - if ((op == Ty_EQ || op == Ty_NE) && diff == 0) { + if ((op == Py_EQ || op == Py_NE) && diff == 0) { int ex = pep495_eq_exception(self, other, offset1, offset2); if (ex == -1) goto done; @@ -6414,10 +6414,10 @@ datetime_richcompare(TyObject *self, TyObject *other, int op) } result = diff_to_bool(diff, op); } - else if (op == Ty_EQ) { + else if (op == Py_EQ) { result = Ty_NewRef(Ty_False); } - else if (op == Ty_NE) { + else if (op == Py_NE) { result = Ty_NewRef(Ty_True); } else { @@ -6756,7 +6756,7 @@ datetime_astimezone(TyObject *op, TyObject *args, TyObject *kw) } static TyObject * -datetime_timetuple(TyObject *op, TyObject *Ty_UNUSED(dummy)) +datetime_timetuple(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); int dstflag = -1; @@ -6832,7 +6832,7 @@ local_to_seconds(int year, int month, int day, #define EPOCH_SECONDS (719163LL * 24 * 60 * 60) static TyObject * -datetime_timestamp(TyObject *op, TyObject *Ty_UNUSED(dummy)) +datetime_timestamp(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); TyObject *result; @@ -6867,7 +6867,7 @@ datetime_timestamp(TyObject *op, TyObject *Ty_UNUSED(dummy)) } static TyObject * -datetime_getdate(TyObject *op, TyObject *Ty_UNUSED(dummy)) +datetime_getdate(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return new_date(GET_YEAR(self), @@ -6876,7 +6876,7 @@ datetime_getdate(TyObject *op, TyObject *Ty_UNUSED(dummy)) } static TyObject * -datetime_gettime(TyObject *op, TyObject *Ty_UNUSED(dummy)) +datetime_gettime(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return new_time(DATE_GET_HOUR(self), @@ -6888,7 +6888,7 @@ datetime_gettime(TyObject *op, TyObject *Ty_UNUSED(dummy)) } static TyObject * -datetime_gettimetz(TyObject *op, TyObject *Ty_UNUSED(dummy)) +datetime_gettimetz(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return new_time(DATE_GET_HOUR(self), @@ -6900,7 +6900,7 @@ datetime_gettimetz(TyObject *op, TyObject *Ty_UNUSED(dummy)) } static TyObject * -datetime_utctimetuple(TyObject *op, TyObject *Ty_UNUSED(dummy)) +datetime_utctimetuple(TyObject *op, TyObject *Py_UNUSED(dummy)) { int y, m, d, hh, mm, ss; TyObject *tzinfo; @@ -6980,7 +6980,7 @@ datetime_reduce_ex(TyObject *op, TyObject *args) } static TyObject * -datetime_reduce(TyObject *op, TyObject *Ty_UNUSED(arg)) +datetime_reduce(TyObject *op, TyObject *Py_UNUSED(arg)) { PyDateTime_DateTime *self = PyDateTime_CAST(op); return Ty_BuildValue("(ON)", Ty_TYPE(self), diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c index 2961af3..62193ab 100644 --- a/Modules/_dbmmodule.c +++ b/Modules/_dbmmodule.c @@ -266,7 +266,7 @@ _dbm_dbm_close_impl(dbmobject *self) dbm_close(self->di_dbm); } self->di_dbm = NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -455,17 +455,17 @@ _dbm_dbm_clear_impl(dbmobject *self, TyTypeObject *cls) return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -dbm__enter__(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dbm__enter__(TyObject *self, TyObject *Py_UNUSED(dummy)) { return Ty_NewRef(self); } static TyObject * -dbm__exit__(TyObject *self, TyObject *Ty_UNUSED(args)) +dbm__exit__(TyObject *self, TyObject *Py_UNUSED(args)) { dbmobject *dp = dbmobject_CAST(self); return _dbm_dbm_close_impl(dp); diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c index 3354855..708ee96 100644 --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -399,7 +399,7 @@ runtime_error_ptr(const char *mesg) return runtime_error_ptr("internal error in " funcname) static void -dec_traphandler(mpd_context_t *Ty_UNUSED(ctx)) /* GCOV_NOT_REACHED */ +dec_traphandler(mpd_context_t *Py_UNUSED(ctx)) /* GCOV_NOT_REACHED */ { /* GCOV_NOT_REACHED */ return; /* GCOV_NOT_REACHED */ } @@ -662,7 +662,7 @@ static const char *INVALID_SIGNALDICT_ERROR_MSG = "invalid signal dict"; static int signaldict_init(TyObject *self, - TyObject *Ty_UNUSED(args), TyObject *Ty_UNUSED(kwds)) + TyObject *Py_UNUSED(args), TyObject *Py_UNUSED(kwds)) { SdFlagAddr(self) = NULL; return 0; @@ -795,9 +795,9 @@ signaldict_richcompare(TyObject *v, TyObject *w, int op) return value_error_ptr(INVALID_SIGNALDICT_ERROR_MSG); } - if (op == Ty_EQ || op == Ty_NE) { + if (op == Py_EQ || op == Py_NE) { if (PyDecSignalDict_Check(state, w)) { - res = (SdFlags(v)==SdFlags(w)) ^ (op==Ty_NE) ? Ty_True : Ty_False; + res = (SdFlags(v)==SdFlags(w)) ^ (op==Py_NE) ? Ty_True : Ty_False; } else if (TyDict_Check(w)) { uint32_t flags = dict_as_flags(state, w); @@ -811,7 +811,7 @@ signaldict_richcompare(TyObject *v, TyObject *w, int op) } } else { - res = (SdFlags(v)==flags) ^ (op==Ty_NE) ? Ty_True : Ty_False; + res = (SdFlags(v)==flags) ^ (op==Py_NE) ? Ty_True : Ty_False; } } } @@ -820,7 +820,7 @@ signaldict_richcompare(TyObject *v, TyObject *w, int op) } static TyObject * -signaldict_copy(TyObject *self, TyObject *Ty_UNUSED(dummy)) +signaldict_copy(TyObject *self, TyObject *Py_UNUSED(dummy)) { if (SdFlagAddr(self) == NULL) { return value_error_ptr(INVALID_SIGNALDICT_ERROR_MSG); @@ -869,14 +869,14 @@ static TyType_Spec signaldict_spec = { #define Dec_CONTEXT_GET_SSIZE(mem) \ static TyObject * \ -context_get##mem(TyObject *self, void *Ty_UNUSED(closure)) \ +context_get##mem(TyObject *self, void *Py_UNUSED(closure)) \ { \ return TyLong_FromSsize_t(mpd_get##mem(CTX(self))); \ } #define Dec_CONTEXT_GET_ULONG(mem) \ static TyObject * \ -context_get##mem(TyObject *self, void *Ty_UNUSED(closure)) \ +context_get##mem(TyObject *self, void *Py_UNUSED(closure)) \ { \ return TyLong_FromUnsignedLong(mpd_get##mem(CTX(self))); \ } @@ -892,7 +892,7 @@ Dec_CONTEXT_GET_ULONG(status) #endif static TyObject * -context_getround(TyObject *self, void *Ty_UNUSED(closure)) +context_getround(TyObject *self, void *Py_UNUSED(closure)) { int i = mpd_getround(CTX(self)); decimal_state *state = get_module_state_from_ctx(self); @@ -901,33 +901,33 @@ context_getround(TyObject *self, void *Ty_UNUSED(closure)) } static TyObject * -context_getcapitals(TyObject *self, void *Ty_UNUSED(closure)) +context_getcapitals(TyObject *self, void *Py_UNUSED(closure)) { return TyLong_FromLong(CtxCaps(self)); } #ifdef EXTRA_FUNCTIONALITY static TyObject * -context_getallcr(TyObject *self, void *Ty_UNUSED(closure)) +context_getallcr(TyObject *self, void *Py_UNUSED(closure)) { return TyLong_FromLong(mpd_getcr(CTX(self))); } #endif static TyObject * -context_getetiny(TyObject *self, TyObject *Ty_UNUSED(dummy)) +context_getetiny(TyObject *self, TyObject *Py_UNUSED(dummy)) { return TyLong_FromSsize_t(mpd_etiny(CTX(self))); } static TyObject * -context_getetop(TyObject *self, TyObject *Ty_UNUSED(dummy)) +context_getetop(TyObject *self, TyObject *Py_UNUSED(dummy)) { return TyLong_FromSsize_t(mpd_etop(CTX(self))); } static int -context_setprec(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) +context_setprec(TyObject *self, TyObject *value, void *Py_UNUSED(closure)) { mpd_context_t *ctx; mpd_ssize_t x; @@ -947,7 +947,7 @@ context_setprec(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) } static int -context_setemin(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) +context_setemin(TyObject *self, TyObject *value, void *Py_UNUSED(closure)) { mpd_context_t *ctx; mpd_ssize_t x; @@ -967,7 +967,7 @@ context_setemin(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) } static int -context_setemax(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) +context_setemax(TyObject *self, TyObject *value, void *Py_UNUSED(closure)) { mpd_context_t *ctx; mpd_ssize_t x; @@ -1004,7 +1004,7 @@ context_unsafe_setprec(TyObject *self, TyObject *value) } ctx->prec = x; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1024,7 +1024,7 @@ context_unsafe_setemin(TyObject *self, TyObject *value) } ctx->emin = x; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1044,12 +1044,12 @@ context_unsafe_setemax(TyObject *self, TyObject *value) } ctx->emax = x; - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif static int -context_setround(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) +context_setround(TyObject *self, TyObject *value, void *Py_UNUSED(closure)) { mpd_context_t *ctx; int x; @@ -1069,7 +1069,7 @@ context_setround(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) } static int -context_setcapitals(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) +context_setcapitals(TyObject *self, TyObject *value, void *Py_UNUSED(closure)) { mpd_ssize_t x; @@ -1089,7 +1089,7 @@ context_setcapitals(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) #ifdef EXTRA_FUNCTIONALITY static int -context_settraps(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) +context_settraps(TyObject *self, TyObject *value, void *Py_UNUSED(closure)) { mpd_context_t *ctx; uint32_t flags; @@ -1154,7 +1154,7 @@ context_settraps_dict(TyObject *self, TyObject *value) #ifdef EXTRA_FUNCTIONALITY static int -context_setstatus(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) +context_setstatus(TyObject *self, TyObject *value, void *Py_UNUSED(closure)) { mpd_context_t *ctx; uint32_t flags; @@ -1219,7 +1219,7 @@ context_setstatus_dict(TyObject *self, TyObject *value) } static int -context_setclamp(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) +context_setclamp(TyObject *self, TyObject *value, void *Py_UNUSED(closure)) { mpd_context_t *ctx; mpd_ssize_t x; @@ -1240,7 +1240,7 @@ context_setclamp(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) #ifdef EXTRA_FUNCTIONALITY static int -context_setallcr(TyObject *self, TyObject *value, void *Ty_UNUSED(closure)) +context_setallcr(TyObject *self, TyObject *value, void *Py_UNUSED(closure)) { mpd_context_t *ctx; mpd_ssize_t x; @@ -1362,17 +1362,17 @@ context_setattrs(TyObject *self, TyObject *prec, TyObject *rounding, } static TyObject * -context_clear_traps(TyObject *self, TyObject *Ty_UNUSED(dummy)) +context_clear_traps(TyObject *self, TyObject *Py_UNUSED(dummy)) { CTX(self)->traps = 0; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -context_clear_flags(TyObject *self, TyObject *Ty_UNUSED(dummy)) +context_clear_flags(TyObject *self, TyObject *Py_UNUSED(dummy)) { CTX(self)->status = 0; - Ty_RETURN_NONE; + Py_RETURN_NONE; } #define DEC_DFLT_EMAX 999999 @@ -1386,7 +1386,7 @@ static mpd_context_t dflt_ctx = { static TyObject * context_new(TyTypeObject *type, - TyObject *Ty_UNUSED(args), TyObject *Ty_UNUSED(kwds)) + TyObject *Py_UNUSED(args), TyObject *Py_UNUSED(kwds)) { PyDecContextObject *self = NULL; mpd_context_t *ctx; @@ -1594,7 +1594,7 @@ error: } static TyObject * -context_copy(TyObject *self, TyObject *Ty_UNUSED(dummy)) +context_copy(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *copy; @@ -1612,7 +1612,7 @@ context_copy(TyObject *self, TyObject *Ty_UNUSED(dummy)) } static TyObject * -context_reduce(TyObject *self, TyObject *Ty_UNUSED(dummy)) +context_reduce(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *flags; TyObject *traps; @@ -1767,7 +1767,7 @@ current_context(decimal_state *modstate) /* Return a new reference to the current context */ static TyObject * -PyDec_GetCurrentContext(TyObject *self, TyObject *Ty_UNUSED(dummy)) +PyDec_GetCurrentContext(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *context; decimal_state *state = get_module_state(self); @@ -1814,7 +1814,7 @@ PyDec_SetCurrentContext(TyObject *self, TyObject *v) } Ty_DECREF(v); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #else static TyObject * @@ -1863,7 +1863,7 @@ current_context(decimal_state *state) /* Return a new reference to the current context */ static TyObject * -PyDec_GetCurrentContext(TyObject *self, TyObject *Ty_UNUSED(dummy)) +PyDec_GetCurrentContext(TyObject *self, TyObject *Py_UNUSED(dummy)) { decimal_state *state = get_module_state(self); return current_context(state); @@ -1898,7 +1898,7 @@ PyDec_SetCurrentContext(TyObject *self, TyObject *v) } Ty_DECREF(tok); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -2001,7 +2001,7 @@ ctxmanager_dealloc(TyObject *self) } static TyObject * -ctxmanager_set_local(TyObject *op, TyObject *Ty_UNUSED(dummy)) +ctxmanager_set_local(TyObject *op, TyObject *Py_UNUSED(dummy)) { TyObject *ret; PyDecContextManagerObject *self = _PyDecContextManagerObject_CAST(op); @@ -2015,7 +2015,7 @@ ctxmanager_set_local(TyObject *op, TyObject *Ty_UNUSED(dummy)) } static TyObject * -ctxmanager_restore_global(TyObject *op, TyObject *Ty_UNUSED(args)) +ctxmanager_restore_global(TyObject *op, TyObject *Py_UNUSED(args)) { TyObject *ret; PyDecContextManagerObject *self = _PyDecContextManagerObject_CAST(op); @@ -2025,7 +2025,7 @@ ctxmanager_restore_global(TyObject *op, TyObject *Ty_UNUSED(args)) } Ty_DECREF(ret); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -3280,7 +3280,7 @@ convert_op_cmp(TyObject **vcmp, TyObject **wcmp, TyObject *v, TyObject *w, *wcmp = PyDec_FromLongExact(state, w, context); } else if (TyFloat_Check(w)) { - if (op != Ty_EQ && op != Ty_NE && + if (op != Py_EQ && op != Py_NE && dec_addstatus(context, MPD_Float_operation)) { *wcmp = NULL; } @@ -3289,7 +3289,7 @@ convert_op_cmp(TyObject **vcmp, TyObject **wcmp, TyObject *v, TyObject *w, *wcmp = PyDec_FromFloatExact(state, w, context); } } - else if (TyComplex_Check(w) && (op == Ty_EQ || op == Ty_NE)) { + else if (TyComplex_Check(w) && (op == Py_EQ || op == Py_NE)) { Ty_complex c = TyComplex_AsCComplex(w); if (c.real == -1.0 && TyErr_Occurred()) { *wcmp = NULL; @@ -3752,7 +3752,7 @@ dec_as_long(TyObject *dec, TyObject *context, int round) /* Convert a Decimal to its exact integer ratio representation. */ static TyObject * -dec_as_integer_ratio(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_as_integer_ratio(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *numerator = NULL; TyObject *denominator = NULL; @@ -4020,7 +4020,7 @@ PyDec_Round(TyObject *dec, TyObject *args) /* Return the DecimalTuple representation of a PyDecObject. */ static TyObject * -PyDec_AsTuple(TyObject *dec, TyObject *Ty_UNUSED(dummy)) +PyDec_AsTuple(TyObject *dec, TyObject *Py_UNUSED(dummy)) { TyObject *result = NULL; TyObject *sign = NULL; @@ -4176,7 +4176,7 @@ nm_##MPDFUNC(TyObject *self, TyObject *other) \ /* Boolean function without a context arg. */ #define Dec_BoolFunc(MPDFUNC) \ static TyObject * \ -dec_##MPDFUNC(TyObject *self, TyObject *Ty_UNUSED(dummy)) \ +dec_##MPDFUNC(TyObject *self, TyObject *Py_UNUSED(dummy)) \ { \ return MPDFUNC(MPD(self)) ? incr_true() : incr_false(); \ } @@ -4505,7 +4505,7 @@ Dec_BoolFuncVA(mpd_issubnormal) /* Unary functions, no context arg */ static TyObject * -dec_mpd_adjexp(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_mpd_adjexp(TyObject *self, TyObject *Py_UNUSED(dummy)) { mpd_ssize_t retval; @@ -4520,13 +4520,13 @@ dec_mpd_adjexp(TyObject *self, TyObject *Ty_UNUSED(dummy)) } static TyObject * -dec_canonical(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_canonical(TyObject *self, TyObject *Py_UNUSED(dummy)) { return Ty_NewRef(self); } static TyObject * -dec_conjugate(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_conjugate(TyObject *self, TyObject *Py_UNUSED(dummy)) { return Ty_NewRef(self); } @@ -4546,14 +4546,14 @@ _dec_mpd_radix(decimal_state *state) } static TyObject * -dec_mpd_radix(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_mpd_radix(TyObject *self, TyObject *Py_UNUSED(dummy)) { decimal_state *state = get_module_state_by_def(Ty_TYPE(self)); return _dec_mpd_radix(state); } static TyObject * -dec_mpd_qcopy_abs(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_mpd_qcopy_abs(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *result; uint32_t status = 0; @@ -4574,7 +4574,7 @@ dec_mpd_qcopy_abs(TyObject *self, TyObject *Ty_UNUSED(dummy)) } static TyObject * -dec_mpd_qcopy_negate(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_mpd_qcopy_negate(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *result; uint32_t status = 0; @@ -4792,33 +4792,33 @@ dec_richcompare(TyObject *v, TyObject *w, int op) Ty_DECREF(b); if (r == INT_MAX) { /* sNaNs or op={le,ge,lt,gt} always signal. */ - if (a_issnan || b_issnan || (op != Ty_EQ && op != Ty_NE)) { + if (a_issnan || b_issnan || (op != Py_EQ && op != Py_NE)) { if (dec_addstatus(context, status)) { return NULL; } } /* qNaN comparison with op={eq,ne} or comparison * with InvalidOperation disabled. */ - return (op == Ty_NE) ? incr_true() : incr_false(); + return (op == Py_NE) ? incr_true() : incr_false(); } switch (op) { - case Ty_EQ: + case Py_EQ: r = (r == 0); break; - case Ty_NE: + case Py_NE: r = (r != 0); break; - case Ty_LE: + case Py_LE: r = (r <= 0); break; - case Ty_GE: + case Py_GE: r = (r >= 0); break; - case Ty_LT: + case Py_LT: r = (r == -1); break; - case Ty_GT: + case Py_GT: r = (r == 1); break; } @@ -4828,7 +4828,7 @@ dec_richcompare(TyObject *v, TyObject *w, int op) /* __ceil__ */ static TyObject * -dec_ceil(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_ceil(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *context; @@ -4839,7 +4839,7 @@ dec_ceil(TyObject *self, TyObject *Ty_UNUSED(dummy)) /* __complex__ */ static TyObject * -dec_complex(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_complex(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *f; double x; @@ -4860,14 +4860,14 @@ dec_complex(TyObject *self, TyObject *Ty_UNUSED(dummy)) /* __copy__ (METH_NOARGS) and __deepcopy__ (METH_O) */ static TyObject * -dec_copy(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_copy(TyObject *self, TyObject *Py_UNUSED(dummy)) { return Ty_NewRef(self); } /* __floor__ */ static TyObject * -dec_floor(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_floor(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *context; @@ -5005,7 +5005,7 @@ dec_hash(TyObject *op) /* __reduce__ */ static TyObject * -dec_reduce(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_reduce(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *result, *str; @@ -5022,7 +5022,7 @@ dec_reduce(TyObject *self, TyObject *Ty_UNUSED(dummy)) /* __sizeof__ */ static TyObject * -dec_sizeof(TyObject *v, TyObject *Ty_UNUSED(dummy)) +dec_sizeof(TyObject *v, TyObject *Py_UNUSED(dummy)) { size_t res = _TyObject_SIZE(Ty_TYPE(v)); if (mpd_isdynamic_data(MPD(v))) { @@ -5033,7 +5033,7 @@ dec_sizeof(TyObject *v, TyObject *Ty_UNUSED(dummy)) /* __trunc__ */ static TyObject * -dec_trunc(TyObject *self, TyObject *Ty_UNUSED(dummy)) +dec_trunc(TyObject *self, TyObject *Py_UNUSED(dummy)) { TyObject *context; @@ -5044,13 +5044,13 @@ dec_trunc(TyObject *self, TyObject *Ty_UNUSED(dummy)) /* real and imag */ static TyObject * -dec_real(TyObject *self, void *Ty_UNUSED(closure)) +dec_real(TyObject *self, void *Py_UNUSED(closure)) { return Ty_NewRef(self); } static TyObject * -dec_imag(TyObject *self, void *Ty_UNUSED(closure)) +dec_imag(TyObject *self, void *Py_UNUSED(closure)) { TyObject *result; diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index 330c85f..95ee51f 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -721,7 +721,7 @@ _elementtree_Element_append_impl(ElementObject *self, TyTypeObject *cls, if (element_add_subelement(st, self, subelement) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -738,7 +738,7 @@ _elementtree_Element_clear_impl(ElementObject *self) _set_joined_ptr(&self->text, Ty_NewRef(Ty_None)); _set_joined_ptr(&self->tail, Ty_NewRef(Ty_None)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1056,7 +1056,7 @@ element_setstate_from_attributes(elementtreestate *st, /* Handle ATTRIB and CHILDREN. */ if (!children && !attrib) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Compute 'nchildren'. */ @@ -1111,7 +1111,7 @@ element_setstate_from_attributes(elementtreestate *st, Ty_XSETREF(self->extra->attrib, Ty_XNewRef(attrib)); dealloc_extra(oldextra); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* __setstate__ for Element instance from the Python implementation. @@ -1260,7 +1260,7 @@ _elementtree_Element_extend_impl(ElementObject *self, TyTypeObject *cls, Ty_DECREF(seq); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1291,7 +1291,7 @@ _elementtree_Element_find_impl(ElementObject *self, TyTypeObject *cls, assert(Element_Check(st, item)); Ty_INCREF(item); TyObject *tag = Ty_NewRef(((ElementObject *)item)->tag); - int rc = PyObject_RichCompareBool(tag, path, Ty_EQ); + int rc = PyObject_RichCompareBool(tag, path, Py_EQ); Ty_DECREF(tag); if (rc > 0) { return item; @@ -1302,7 +1302,7 @@ _elementtree_Element_find_impl(ElementObject *self, TyTypeObject *cls, } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1335,7 +1335,7 @@ _elementtree_Element_findtext_impl(ElementObject *self, TyTypeObject *cls, assert(Element_Check(st, item)); Ty_INCREF(item); TyObject *tag = Ty_NewRef(((ElementObject *)item)->tag); - int rc = PyObject_RichCompareBool(tag, path, Ty_EQ); + int rc = PyObject_RichCompareBool(tag, path, Py_EQ); Ty_DECREF(tag); if (rc > 0) { TyObject *text = element_get_text((ElementObject *)item); @@ -1388,7 +1388,7 @@ _elementtree_Element_findall_impl(ElementObject *self, TyTypeObject *cls, assert(Element_Check(st, item)); Ty_INCREF(item); TyObject *tag = Ty_NewRef(((ElementObject *)item)->tag); - int rc = PyObject_RichCompareBool(tag, path, Ty_EQ); + int rc = PyObject_RichCompareBool(tag, path, Py_EQ); Ty_DECREF(tag); if (rc != 0 && (rc < 0 || TyList_Append(out, item) < 0)) { Ty_DECREF(item); @@ -1570,7 +1570,7 @@ _elementtree_Element_insert_impl(ElementObject *self, Ty_ssize_t index, self->extra->length++; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1668,7 +1668,7 @@ _elementtree_Element_remove_impl(ElementObject *self, TyObject *subelement) break; } TyObject *child = Ty_NewRef(self->extra->children[i]); - rc = PyObject_RichCompareBool(child, subelement, Ty_EQ); + rc = PyObject_RichCompareBool(child, subelement, Py_EQ); Ty_DECREF(child); if (rc < 0) { return NULL; @@ -1688,7 +1688,7 @@ _elementtree_Element_remove_impl(ElementObject *self, TyObject *subelement) // step and removes or clears the 'extra' list (the condition on the // length would not be satisfied any more). if (self->extra == NULL || i >= self->extra->length) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *found = self->extra->children[i]; @@ -1699,7 +1699,7 @@ _elementtree_Element_remove_impl(ElementObject *self, TyObject *subelement) } Ty_DECREF(found); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject* @@ -1752,7 +1752,7 @@ _elementtree_Element_set_impl(ElementObject *self, TyObject *key, if (TyDict_SetItem(attrib, key, value) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -2279,7 +2279,7 @@ elementiter_next(TyObject *op) if (it->sought_tag == Ty_None) return (TyObject *)elem; - rc = PyObject_RichCompareBool(elem->tag, it->sought_tag, Ty_EQ); + rc = PyObject_RichCompareBool(elem->tag, it->sought_tag, Py_EQ); if (rc > 0) return (TyObject *)elem; @@ -2788,7 +2788,7 @@ treebuilder_handle_data(TreeBuilderObject* self, TyObject* data) if (!self->data) { if (self->last == Ty_None) { /* ignore calls to data before the first call to start */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* store the first item as is */ self->data = Ty_NewRef(data); @@ -2816,7 +2816,7 @@ treebuilder_handle_data(TreeBuilderObject* self, TyObject* data) } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } LOCAL(TyObject*) @@ -2948,7 +2948,7 @@ treebuilder_handle_start_ns(TreeBuilderObject* self, TyObject* prefix, TyObject* Ty_DECREF(parcel); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } LOCAL(TyObject*) @@ -2960,7 +2960,7 @@ treebuilder_handle_end_ns(TreeBuilderObject* self, TyObject* prefix) } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* -------------------------------------------------------------------- */ @@ -3901,7 +3901,7 @@ expat_parse(elementtreestate *st, XMLParserObject *self, const char *data, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -3954,7 +3954,7 @@ _elementtree_XMLParser_flush_impl(XMLParserObject *self) elementtreestate *st = self->state; if (EXPAT(st, SetReparseDeferralEnabled) == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } // NOTE: The Expat parser in the C implementation of ElementTree is not @@ -4161,7 +4161,7 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self, if (events_to_report == Ty_None) { /* default is "end" only */ target->end_event_obj = TyUnicode_FromString("end"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (!(events_seq = PySequence_Fast(events_to_report, @@ -4221,12 +4221,12 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self, } Ty_DECREF(events_seq); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMemberDef xmlparser_members[] = { - {"entity", _Ty_T_OBJECT, offsetof(XMLParserObject, entity), Ty_READONLY, NULL}, - {"target", _Ty_T_OBJECT, offsetof(XMLParserObject, target), Ty_READONLY, NULL}, + {"entity", _Ty_T_OBJECT, offsetof(XMLParserObject, entity), Py_READONLY, NULL}, + {"target", _Ty_T_OBJECT, offsetof(XMLParserObject, target), Py_READONLY, NULL}, {NULL} }; @@ -4282,7 +4282,7 @@ static TyMethodDef element_methods[] = { }; static struct TyMemberDef element_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(ElementObject, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(ElementObject, weakreflist), Py_READONLY}, {NULL}, }; diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c index 7f0851e..3f1a030 100644 --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -66,7 +66,7 @@ placeholder_repr(TyObject *op) } static TyObject * -placeholder_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +placeholder_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { return TyUnicode_FromString("Placeholder"); } @@ -584,18 +584,18 @@ and keywords."); #define OFF(x) offsetof(partialobject, x) static TyMemberDef partial_memberlist[] = { - {"func", _Ty_T_OBJECT, OFF(fn), Ty_READONLY, + {"func", _Ty_T_OBJECT, OFF(fn), Py_READONLY, "function object to use in future partial calls"}, - {"args", _Ty_T_OBJECT, OFF(args), Ty_READONLY, + {"args", _Ty_T_OBJECT, OFF(args), Py_READONLY, "tuple of arguments to future partial calls"}, - {"keywords", _Ty_T_OBJECT, OFF(kw), Ty_READONLY, + {"keywords", _Ty_T_OBJECT, OFF(kw), Py_READONLY, "dictionary of keyword arguments to future partial calls"}, {"__weaklistoffset__", Ty_T_PYSSIZET, - offsetof(partialobject, weakreflist), Ty_READONLY}, + offsetof(partialobject, weakreflist), Py_READONLY}, {"__dictoffset__", Ty_T_PYSSIZET, - offsetof(partialobject, dict), Ty_READONLY}, + offsetof(partialobject, dict), Py_READONLY}, {"__vectorcalloffset__", Ty_T_PYSSIZET, - offsetof(partialobject, vectorcall), Ty_READONLY}, + offsetof(partialobject, vectorcall), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -678,7 +678,7 @@ partial_repr(TyObject *self) */ static TyObject * -partial_reduce(TyObject *self, TyObject *Ty_UNUSED(args)) +partial_reduce(TyObject *self, TyObject *Py_UNUSED(args)) { partialobject *pto = partialobject_CAST(self); return Ty_BuildValue("O(O)(OOOO)", Ty_TYPE(pto), pto->fn, pto->fn, @@ -747,7 +747,7 @@ partial_setstate(TyObject *self, TyObject *state) pto->phcount = phcount; Ty_XSETREF(pto->dict, dict); partial_setvectorcall(pto); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef partial_methods[] = { @@ -833,7 +833,7 @@ static TyMemberDef keyobject_members[] = { }; static TyObject * -keyobject_text_signature(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(ignored)) +keyobject_text_signature(TyObject *Py_UNUSED(self), void *Py_UNUSED(ignored)) { return TyUnicode_FromString("(obj)"); } @@ -1694,23 +1694,23 @@ _functools__lru_cache_wrapper_cache_clear_impl(TyObject *self) TyDict_Clear(_self->cache); } lru_cache_clear_list(list); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -lru_cache_reduce(TyObject *self, TyObject *Ty_UNUSED(dummy)) +lru_cache_reduce(TyObject *self, TyObject *Py_UNUSED(dummy)) { return PyObject_GetAttrString(self, "__qualname__"); } static TyObject * -lru_cache_copy(TyObject *self, TyObject *Ty_UNUSED(args)) +lru_cache_copy(TyObject *self, TyObject *Py_UNUSED(args)) { return Ty_NewRef(self); } static TyObject * -lru_cache_deepcopy(TyObject *self, TyObject *Ty_UNUSED(args)) +lru_cache_deepcopy(TyObject *self, TyObject *Py_UNUSED(args)) { return Ty_NewRef(self); } @@ -1770,9 +1770,9 @@ static TyGetSetDef lru_cache_getsetlist[] = { static TyMemberDef lru_cache_memberlist[] = { {"__dictoffset__", Ty_T_PYSSIZET, - offsetof(lru_cache_object, dict), Ty_READONLY}, + offsetof(lru_cache_object, dict), Py_READONLY}, {"__weaklistoffset__", Ty_T_PYSSIZET, - offsetof(lru_cache_object, weakreflist), Ty_READONLY}, + offsetof(lru_cache_object, weakreflist), Py_READONLY}, {NULL} /* Sentinel */ }; diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c index cb18a87..906605a 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -376,7 +376,7 @@ _gdbm_gdbm_close_impl(gdbmobject *self) gdbm_close(self->di_dbm); } self->di_dbm = NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* XXX Should return a set or a set view */ @@ -492,7 +492,7 @@ _gdbm_gdbm_firstkey_impl(gdbmobject *self, TyTypeObject *cls) return v; } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -534,7 +534,7 @@ _gdbm_gdbm_nextkey_impl(gdbmobject *self, TyTypeObject *cls, const char *key, return v; } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -569,7 +569,7 @@ _gdbm_gdbm_reorganize_impl(gdbmobject *self, TyTypeObject *cls) } return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -591,7 +591,7 @@ _gdbm_gdbm_sync_impl(gdbmobject *self, TyTypeObject *cls) assert(state != NULL); check_gdbmobject_open(self, state->gdbm_error); gdbm_sync(self->di_dbm); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -622,7 +622,7 @@ _gdbm_gdbm_clear_impl(gdbmobject *self, TyTypeObject *cls) return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 0748ca0..6a69a5b 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -696,7 +696,7 @@ EVP_update_impl(EVPobject *self, TyObject *obj) if (result == -1) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef EVP_methods[] = { @@ -708,7 +708,7 @@ static TyMethodDef EVP_methods[] = { }; static TyObject * -EVP_get_block_size(TyObject *op, void *Ty_UNUSED(closure)) +EVP_get_block_size(TyObject *op, void *Py_UNUSED(closure)) { EVPobject *self = EVPobject_CAST(op); long block_size = EVP_MD_CTX_block_size(self->ctx); @@ -716,7 +716,7 @@ EVP_get_block_size(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -EVP_get_digest_size(TyObject *op, void *Ty_UNUSED(closure)) +EVP_get_digest_size(TyObject *op, void *Py_UNUSED(closure)) { EVPobject *self = EVPobject_CAST(op); long size = EVP_MD_CTX_size(self->ctx); @@ -724,7 +724,7 @@ EVP_get_digest_size(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -EVP_get_name(TyObject *op, void *Ty_UNUSED(closure)) +EVP_get_name(TyObject *op, void *Py_UNUSED(closure)) { EVPobject *self = EVPobject_CAST(op); const EVP_MD *md = EVP_MD_CTX_md(self->ctx); @@ -897,7 +897,7 @@ static TyMethodDef EVPXOF_methods[] = { static TyObject * -EVPXOF_get_digest_size(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +EVPXOF_get_digest_size(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyLong_FromLong(0); } @@ -1783,7 +1783,7 @@ _hashlib_HMAC_update_impl(HMACobject *self, TyObject *msg) if (!_hmac_update(self, msg)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -1855,7 +1855,7 @@ _hashlib_HMAC_hexdigest_impl(HMACobject *self) } static TyObject * -_hashlib_hmac_get_digest_size(TyObject *op, void *Ty_UNUSED(closure)) +_hashlib_hmac_get_digest_size(TyObject *op, void *Py_UNUSED(closure)) { HMACobject *self = HMACobject_CAST(op); unsigned int digest_size = _hashlib_hmac_digest_size(self); @@ -1863,7 +1863,7 @@ _hashlib_hmac_get_digest_size(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -_hashlib_hmac_get_block_size(TyObject *op, void *Ty_UNUSED(closure)) +_hashlib_hmac_get_block_size(TyObject *op, void *Py_UNUSED(closure)) { HMACobject *self = HMACobject_CAST(op); const EVP_MD *md = _hashlib_hmac_get_md(self); @@ -1871,7 +1871,7 @@ _hashlib_hmac_get_block_size(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -_hashlib_hmac_get_name(TyObject *op, void *Ty_UNUSED(closure)) +_hashlib_hmac_get_name(TyObject *op, void *Py_UNUSED(closure)) { HMACobject *self = HMACobject_CAST(op); const EVP_MD *md = _hashlib_hmac_get_md(self); diff --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c index 5f9ab52..d8c0d8f 100644 --- a/Modules/_heapqmodule.c +++ b/Modules/_heapqmodule.c @@ -45,7 +45,7 @@ siftdown(PyListObject *heap, Ty_ssize_t startpos, Ty_ssize_t pos) parent = arr[parentpos]; Ty_INCREF(newitem); Ty_INCREF(parent); - cmp = PyObject_RichCompareBool(newitem, parent, Ty_LT); + cmp = PyObject_RichCompareBool(newitem, parent, Py_LT); Ty_DECREF(parent); Ty_DECREF(newitem); if (cmp < 0) @@ -93,7 +93,7 @@ siftup(PyListObject *heap, Ty_ssize_t pos) TyObject* b = arr[childpos + 1]; Ty_INCREF(a); Ty_INCREF(b); - cmp = PyObject_RichCompareBool(a, b, Ty_LT); + cmp = PyObject_RichCompareBool(a, b, Py_LT); Ty_DECREF(a); Ty_DECREF(b); if (cmp < 0) @@ -146,7 +146,7 @@ _heapq_heappush_impl(TyObject *module, TyObject *heap, TyObject *item) if (siftdown((PyListObject *)heap, 0, TyList_GET_SIZE(heap)-1)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -273,7 +273,7 @@ _heapq_heappushpop_impl(TyObject *module, TyObject *heap, TyObject *item) TyObject* top = TyList_GET_ITEM(heap, 0); Ty_INCREF(top); - cmp = PyObject_RichCompareBool(top, item, Ty_LT); + cmp = PyObject_RichCompareBool(top, item, Py_LT); Ty_DECREF(top); if (cmp < 0) return NULL; @@ -358,7 +358,7 @@ cache_friendly_heapify(TyObject *heap, int siftup_func(PyListObject *, Ty_ssize_ j >>= 1; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -384,7 +384,7 @@ heapify_internal(TyObject *heap, int siftup_func(PyListObject *, Ty_ssize_t)) for (i = (n >> 1) - 1 ; i >= 0 ; i--) if (siftup_func((PyListObject *)heap, i)) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -426,7 +426,7 @@ siftdown_max(PyListObject *heap, Ty_ssize_t startpos, Ty_ssize_t pos) parentpos = (pos - 1) >> 1; parent = Ty_NewRef(arr[parentpos]); Ty_INCREF(newitem); - cmp = PyObject_RichCompareBool(parent, newitem, Ty_LT); + cmp = PyObject_RichCompareBool(parent, newitem, Py_LT); Ty_DECREF(parent); Ty_DECREF(newitem); if (cmp < 0) @@ -474,7 +474,7 @@ siftup_max(PyListObject *heap, Ty_ssize_t pos) TyObject* b = arr[childpos]; Ty_INCREF(a); Ty_INCREF(b); - cmp = PyObject_RichCompareBool(a, b, Ty_LT); + cmp = PyObject_RichCompareBool(a, b, Py_LT); Ty_DECREF(a); Ty_DECREF(b); if (cmp < 0) @@ -528,7 +528,7 @@ _heapq_heappush_max_impl(TyObject *module, TyObject *heap, TyObject *item) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -610,7 +610,7 @@ _heapq_heappushpop_max_impl(TyObject *module, TyObject *heap, TyObject *item) TyObject *top = TyList_GET_ITEM(heap, 0); Ty_INCREF(top); - cmp = PyObject_RichCompareBool(item, top, Ty_LT); + cmp = PyObject_RichCompareBool(item, top, Py_LT); Ty_DECREF(top); if (cmp < 0) { return NULL; diff --git a/Modules/_interpchannelsmodule.c b/Modules/_interpchannelsmodule.c index 681f16b..2bb7b4c 100644 --- a/Modules/_interpchannelsmodule.c +++ b/Modules/_interpchannelsmodule.c @@ -2498,8 +2498,8 @@ static TyObject * channelid_richcompare(TyObject *self, TyObject *other, int op) { TyObject *res = NULL; - if (op != Ty_EQ && op != Ty_NE) { - Ty_RETURN_NOTIMPLEMENTED; + if (op != Py_EQ && op != Py_NE) { + Py_RETURN_NOTIMPLEMENTED; } TyObject *mod = get_module_from_type(Ty_TYPE(self)); @@ -2545,7 +2545,7 @@ channelid_richcompare(TyObject *self, TyObject *other, int op) goto done; } - if ((op == Ty_EQ && equal) || (op == Ty_NE && !equal)) { + if ((op == Py_EQ && equal) || (op == Py_NE && !equal)) { res = Ty_NewRef(Ty_True); } else { @@ -2979,7 +2979,7 @@ channelsmod_destroy(TyObject *self, TyObject *args, TyObject *kwds) if (handle_channel_error(err, self, cid)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(channelsmod_destroy_doc, @@ -2989,7 +2989,7 @@ Close and finalize the channel. Afterward attempts to use the channel\n\ will behave as though it never existed."); static TyObject * -channelsmod_list_all(TyObject *self, TyObject *Ty_UNUSED(ignored)) +channelsmod_list_all(TyObject *self, TyObject *Py_UNUSED(ignored)) { int64_t count = 0; struct channel_id_and_info *cids = @@ -3166,7 +3166,7 @@ channelsmod_send(TyObject *self, TyObject *args, TyObject *kwds) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(channelsmod_send_doc, @@ -3237,7 +3237,7 @@ channelsmod_send_buffer(TyObject *self, TyObject *args, TyObject *kwds) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(channelsmod_send_buffer_doc, @@ -3313,7 +3313,7 @@ channelsmod_close(TyObject *self, TyObject *args, TyObject *kwds) if (handle_channel_error(err, self, cid)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(channelsmod_close_doc, @@ -3374,7 +3374,7 @@ channelsmod_release(TyObject *self, TyObject *args, TyObject *kwds) if (handle_channel_error(err, self, cid)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(channelsmod_release_doc, @@ -3510,7 +3510,7 @@ channelsmod__register_end_types(TyObject *self, TyObject *args, TyObject *kwds) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef module_functions[] = { diff --git a/Modules/_interpqueuesmodule.c b/Modules/_interpqueuesmodule.c index e650edb..5568f23 100644 --- a/Modules/_interpqueuesmodule.c +++ b/Modules/_interpqueuesmodule.c @@ -1548,7 +1548,7 @@ queuesmod_destroy(TyObject *self, TyObject *args, TyObject *kwds) if (handle_queue_error(err, self, qid)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(queuesmod_destroy_doc, @@ -1558,7 +1558,7 @@ Clear and destroy the queue. Afterward attempts to use the queue\n\ will behave as though it never existed."); static TyObject * -queuesmod_list_all(TyObject *self, TyObject *Ty_UNUSED(ignored)) +queuesmod_list_all(TyObject *self, TyObject *Py_UNUSED(ignored)) { int64_t count = 0; struct queue_id_and_info *qids = _queues_list_all(&_globals.queues, &count); @@ -1633,7 +1633,7 @@ queuesmod_put(TyObject *self, TyObject *args, TyObject *kwds) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(queuesmod_put_doc, @@ -1696,7 +1696,7 @@ queuesmod_bind(TyObject *self, TyObject *args, TyObject *kwds) // XXX Update module state. - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(queuesmod_bind_doc, @@ -1726,7 +1726,7 @@ queuesmod_release(TyObject *self, TyObject *args, TyObject *kwds) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(queuesmod_release_doc, @@ -1805,9 +1805,9 @@ queuesmod_is_full(TyObject *self, TyObject *args, TyObject *kwds) return NULL; } if (is_full) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } PyDoc_STRVAR(queuesmod_is_full_doc, @@ -1878,7 +1878,7 @@ queuesmod__register_heap_types(TyObject *self, TyObject *args, TyObject *kwds) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef module_functions[] = { diff --git a/Modules/_interpretersmodule.c b/Modules/_interpretersmodule.c index 19fee22..6be9a7f 100644 --- a/Modules/_interpretersmodule.c +++ b/Modules/_interpretersmodule.c @@ -943,7 +943,7 @@ interp_destroy(TyObject *self, TyObject *args, TyObject *kwds) // Destroy the interpreter. _PyXI_EndInterpreter(interp, NULL, NULL); - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(destroy_doc, @@ -1002,7 +1002,7 @@ Return a list containing the ID of every existing interpreter."); static TyObject * -interp_get_current(TyObject *self, TyObject *Ty_UNUSED(ignored)) +interp_get_current(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyInterpreterState *interp =_get_current_interp(); if (interp == NULL) { @@ -1019,7 +1019,7 @@ Return the ID of current interpreter."); static TyObject * -interp_get_main(TyObject *self, TyObject *Ty_UNUSED(ignored)) +interp_get_main(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyInterpreterState *interp = _TyInterpreterState_Main(); assert(_TyInterpreterState_IsReady(interp)); @@ -1088,7 +1088,7 @@ interp_set___main___attrs(TyObject *self, TyObject *args, TyObject *kwargs) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(set___main___attrs_doc, @@ -1149,7 +1149,7 @@ interp_exec(TyObject *self, TyObject *args, TyObject *kwds) return _handle_script_error(&runres); } assert(runres.result == NULL); - Ty_RETURN_NONE; + Py_RETURN_NONE; #undef FUNCNAME } @@ -1213,7 +1213,7 @@ interp_run_string(TyObject *self, TyObject *args, TyObject *kwds) return _handle_script_error(&runres); } assert(runres.result == NULL); - Ty_RETURN_NONE; + Py_RETURN_NONE; #undef FUNCNAME } @@ -1276,7 +1276,7 @@ interp_run_func(TyObject *self, TyObject *args, TyObject *kwds) return _handle_script_error(&runres); } assert(runres.result == NULL); - Ty_RETURN_NONE; + Py_RETURN_NONE; #undef FUNCNAME } @@ -1363,10 +1363,10 @@ object_is_shareable(TyObject *self, TyObject *args, TyObject *kwds) PyThreadState *tstate = _TyThreadState_GET(); if (_TyObject_CheckXIData(tstate, obj) == 0) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } TyErr_Clear(); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } PyDoc_STRVAR(is_shareable_doc, @@ -1397,9 +1397,9 @@ interp_is_running(TyObject *self, TyObject *args, TyObject *kwds) } if (is_running_main(interp)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } PyDoc_STRVAR(is_running_doc, @@ -1501,7 +1501,7 @@ interp_incref(TyObject *self, TyObject *args, TyObject *kwds) } _TyInterpreterState_IDIncref(interp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1526,7 +1526,7 @@ interp_decref(TyObject *self, TyObject *args, TyObject *kwds) _TyInterpreterState_IDDecref(interp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1546,7 +1546,7 @@ capture_exception(TyObject *self, TyObject *args, TyObject *kwds) if (exc == NULL) { exc = TyErr_GetRaisedException(); if (exc == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } else if (!PyExceptionInstance_Check(exc)) { diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index abe5ec3..5937108 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -164,7 +164,7 @@ mode and no data is available at the moment. static TyObject * _io__BufferedIOBase_read_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(size)) + int Py_UNUSED(size)) /*[clinic end generated code: output=aceb2765587b0a29 input=824f6f910465e61a]*/ { _PyIO_State *state = get_io_state_by_cls(cls); @@ -186,7 +186,7 @@ A short result does not imply that EOF is imminent. static TyObject * _io__BufferedIOBase_read1_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(size)) + int Py_UNUSED(size)) /*[clinic end generated code: output=2e7fc62972487eaa input=af76380e020fd9e6]*/ { _PyIO_State *state = get_io_state_by_cls(cls); @@ -211,7 +211,7 @@ underlying raw stream cannot accept more data at the moment. static TyObject * _io__BufferedIOBase_write_impl(TyObject *self, TyTypeObject *cls, - TyObject *Ty_UNUSED(b)) + TyObject *Py_UNUSED(b)) /*[clinic end generated code: output=712c635246bf2306 input=9793f5c8f71029ad]*/ { _PyIO_State *state = get_io_state_by_cls(cls); @@ -485,7 +485,7 @@ _io__Buffered__dealloc_warn_impl(buffered *self, TyObject *source) else TyErr_Clear(); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* @@ -914,7 +914,7 @@ buffered_flush_and_rewind_unlocked(buffered *self) if (n == -1) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1777,7 +1777,7 @@ _bufferedreader_read_fast(buffered *self, Ty_ssize_t n) self->pos += n; return res; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Generic read function: read from the stream until enough bytes are read, @@ -1831,7 +1831,7 @@ _bufferedreader_read_generic(buffered *self, Ty_ssize_t n) return res; } Ty_DECREF(res); - Ty_RETURN_NONE; + Py_RETURN_NONE; } remaining -= r; written += r; @@ -1855,7 +1855,7 @@ _bufferedreader_read_generic(buffered *self, Ty_ssize_t n) return res; } Ty_DECREF(res); - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (remaining > r) { memcpy(out + written, self->buffer + self->pos, r); @@ -2060,7 +2060,7 @@ end: Issue: https://bugs.python.org/issue32228 */ _bufferedwriter_reset_buf(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; error: return NULL; @@ -2382,28 +2382,28 @@ bufferedrwpair_write(TyObject *op, TyObject *args) } static TyObject * -bufferedrwpair_flush(TyObject *op, TyObject *Ty_UNUSED(dummy)) +bufferedrwpair_flush(TyObject *op, TyObject *Py_UNUSED(dummy)) { rwpair *self = rwpair_CAST(op); return _forward_call(self->writer, &_Ty_ID(flush), NULL); } static TyObject * -bufferedrwpair_readable(TyObject *op, TyObject *Ty_UNUSED(dummy)) +bufferedrwpair_readable(TyObject *op, TyObject *Py_UNUSED(dummy)) { rwpair *self = rwpair_CAST(op); return _forward_call(self->reader, &_Ty_ID(readable), NULL); } static TyObject * -bufferedrwpair_writable(TyObject *op, TyObject *Ty_UNUSED(dummy)) +bufferedrwpair_writable(TyObject *op, TyObject *Py_UNUSED(dummy)) { rwpair *self = rwpair_CAST(op); return _forward_call(self->writer, &_Ty_ID(writable), NULL); } static TyObject * -bufferedrwpair_close(TyObject *op, TyObject *Ty_UNUSED(dummy)) +bufferedrwpair_close(TyObject *op, TyObject *Py_UNUSED(dummy)) { rwpair *self = rwpair_CAST(op); TyObject *exc = NULL; @@ -2423,7 +2423,7 @@ bufferedrwpair_close(TyObject *op, TyObject *Ty_UNUSED(dummy)) } static TyObject * -bufferedrwpair_isatty(TyObject *op, TyObject *Ty_UNUSED(dummy)) +bufferedrwpair_isatty(TyObject *op, TyObject *Py_UNUSED(dummy)) { rwpair *self = rwpair_CAST(op); TyObject *ret = _forward_call(self->writer, &_Ty_ID(isatty), NULL); @@ -2438,7 +2438,7 @@ bufferedrwpair_isatty(TyObject *op, TyObject *Ty_UNUSED(dummy)) } static TyObject * -bufferedrwpair_closed_get(TyObject *op, void *Ty_UNUSED(dummy)) +bufferedrwpair_closed_get(TyObject *op, void *Py_UNUSED(dummy)) { rwpair *self = rwpair_CAST(op); if (self->writer == NULL) { @@ -2559,10 +2559,10 @@ static TyMethodDef bufferedreader_methods[] = { }; static TyMemberDef bufferedreader_members[] = { - {"raw", _Ty_T_OBJECT, offsetof(buffered, raw), Ty_READONLY}, + {"raw", _Ty_T_OBJECT, offsetof(buffered, raw), Py_READONLY}, {"_finalizing", Ty_T_BOOL, offsetof(buffered, finalizing), 0}, - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(buffered, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(buffered, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(buffered, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(buffered, dict), Py_READONLY}, {NULL} }; @@ -2618,10 +2618,10 @@ static TyMethodDef bufferedwriter_methods[] = { }; static TyMemberDef bufferedwriter_members[] = { - {"raw", _Ty_T_OBJECT, offsetof(buffered, raw), Ty_READONLY}, + {"raw", _Ty_T_OBJECT, offsetof(buffered, raw), Py_READONLY}, {"_finalizing", Ty_T_BOOL, offsetof(buffered, finalizing), 0}, - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(buffered, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(buffered, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(buffered, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(buffered, dict), Py_READONLY}, {NULL} }; @@ -2674,8 +2674,8 @@ static TyMethodDef bufferedrwpair_methods[] = { }; static TyMemberDef bufferedrwpair_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(rwpair, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(rwpair, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(rwpair, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(rwpair, dict), Py_READONLY}, {NULL} }; @@ -2735,10 +2735,10 @@ static TyMethodDef bufferedrandom_methods[] = { }; static TyMemberDef bufferedrandom_members[] = { - {"raw", _Ty_T_OBJECT, offsetof(buffered, raw), Ty_READONLY}, + {"raw", _Ty_T_OBJECT, offsetof(buffered, raw), Py_READONLY}, {"_finalizing", Ty_T_BOOL, offsetof(buffered, finalizing), 0}, - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(buffered, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(buffered, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(buffered, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(buffered, dict), Py_READONLY}, {NULL} }; diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index 4fd88c9..0a6783f 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -244,14 +244,14 @@ write_bytes(bytesio *self, TyObject *b) } static TyObject * -bytesio_get_closed(TyObject *op, void *Ty_UNUSED(closure)) +bytesio_get_closed(TyObject *op, void *Py_UNUSED(closure)) { bytesio *self = bytesio_CAST(op); if (self->buf == NULL) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } @@ -266,7 +266,7 @@ _io_BytesIO_readable_impl(bytesio *self) /*[clinic end generated code: output=4e93822ad5b62263 input=96c5d0cccfb29f5c]*/ { CHECK_CLOSED(self); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -280,7 +280,7 @@ _io_BytesIO_writable_impl(bytesio *self) /*[clinic end generated code: output=64ff6a254b1150b8 input=700eed808277560a]*/ { CHECK_CLOSED(self); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -294,7 +294,7 @@ _io_BytesIO_seekable_impl(bytesio *self) /*[clinic end generated code: output=6b417f46dcc09b56 input=9421f65627a344dd]*/ { CHECK_CLOSED(self); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -308,7 +308,7 @@ _io_BytesIO_flush_impl(bytesio *self) /*[clinic end generated code: output=187e3d781ca134a0 input=561ea490be4581a7]*/ { CHECK_CLOSED(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -381,7 +381,7 @@ _io_BytesIO_isatty_impl(bytesio *self) /*[clinic end generated code: output=df67712e669f6c8f input=6f97f0985d13f827]*/ { CHECK_CLOSED(self); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /*[clinic input] @@ -756,7 +756,7 @@ _io_BytesIO_writelines_impl(bytesio *self, TyObject *lines) if (TyErr_Occurred()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -771,7 +771,7 @@ _io_BytesIO_close_impl(bytesio *self) { CHECK_EXPORTS(self); Ty_CLEAR(self->buf); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Pickling support. @@ -790,7 +790,7 @@ _io_BytesIO_close_impl(bytesio *self) */ static TyObject * -bytesio_getstate(TyObject *op, TyObject *Ty_UNUSED(dummy)) +bytesio_getstate(TyObject *op, TyObject *Py_UNUSED(dummy)) { bytesio *self = bytesio_CAST(op); TyObject *initvalue = _io_BytesIO_getvalue_impl(self); @@ -888,7 +888,7 @@ bytesio_setstate(TyObject *op, TyObject *state) } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static void @@ -970,7 +970,7 @@ _io_BytesIO___init___impl(bytesio *self, TyObject *initvalue) } static TyObject * -bytesio_sizeof(TyObject *op, TyObject *Ty_UNUSED(dummy)) +bytesio_sizeof(TyObject *op, TyObject *Py_UNUSED(dummy)) { bytesio *self = bytesio_CAST(op); size_t res = _TyObject_SIZE(Ty_TYPE(self)); @@ -1042,8 +1042,8 @@ static struct TyMethodDef bytesio_methods[] = { }; static TyMemberDef bytesio_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(bytesio, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(bytesio, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(bytesio, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(bytesio, dict), Py_READONLY}, {NULL} }; @@ -1101,7 +1101,7 @@ bytesiobuf_getbuffer(TyObject *op, Ty_buffer *view, int flags) } static void -bytesiobuf_releasebuffer(TyObject *op, Ty_buffer *Ty_UNUSED(view)) +bytesiobuf_releasebuffer(TyObject *op, Ty_buffer *Py_UNUSED(view)) { bytesiobuf *obj = bytesiobuf_CAST(op); bytesio *b = bytesio_CAST(obj->source); diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h index 2f4557d..e52d211 100644 --- a/Modules/_io/clinic/bufferedio.c.h +++ b/Modules/_io/clinic/bufferedio.c.h @@ -129,7 +129,7 @@ PyDoc_STRVAR(_io__BufferedIOBase_read__doc__, static TyObject * _io__BufferedIOBase_read_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(size)); + int Py_UNUSED(size)); static TyObject * _io__BufferedIOBase_read(TyObject *self, TyTypeObject *cls, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) @@ -184,7 +184,7 @@ PyDoc_STRVAR(_io__BufferedIOBase_read1__doc__, static TyObject * _io__BufferedIOBase_read1_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(size)); + int Py_UNUSED(size)); static TyObject * _io__BufferedIOBase_read1(TyObject *self, TyTypeObject *cls, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) @@ -242,7 +242,7 @@ PyDoc_STRVAR(_io__BufferedIOBase_write__doc__, static TyObject * _io__BufferedIOBase_write_impl(TyObject *self, TyTypeObject *cls, - TyObject *Ty_UNUSED(b)); + TyObject *Py_UNUSED(b)); static TyObject * _io__BufferedIOBase_write(TyObject *self, TyTypeObject *cls, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) @@ -288,7 +288,7 @@ static TyObject * _io__Buffered___sizeof___impl(buffered *self); static TyObject * -_io__Buffered___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -332,7 +332,7 @@ static TyObject * _io__Buffered_simple_flush_impl(buffered *self); static TyObject * -_io__Buffered_simple_flush(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_simple_flush(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -357,7 +357,7 @@ static TyObject * _io__Buffered_closed_get_impl(buffered *self); static TyObject * -_io__Buffered_closed_get(TyObject *self, void *Ty_UNUSED(context)) +_io__Buffered_closed_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -380,7 +380,7 @@ static TyObject * _io__Buffered_close_impl(buffered *self); static TyObject * -_io__Buffered_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -403,7 +403,7 @@ static TyObject * _io__Buffered_detach_impl(buffered *self); static TyObject * -_io__Buffered_detach(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_detach(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -426,7 +426,7 @@ static TyObject * _io__Buffered_seekable_impl(buffered *self); static TyObject * -_io__Buffered_seekable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_seekable(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -449,7 +449,7 @@ static TyObject * _io__Buffered_readable_impl(buffered *self); static TyObject * -_io__Buffered_readable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_readable(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -472,7 +472,7 @@ static TyObject * _io__Buffered_writable_impl(buffered *self); static TyObject * -_io__Buffered_writable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_writable(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -497,7 +497,7 @@ static TyObject * _io__Buffered_name_get_impl(buffered *self); static TyObject * -_io__Buffered_name_get(TyObject *self, void *Ty_UNUSED(context)) +_io__Buffered_name_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -522,7 +522,7 @@ static TyObject * _io__Buffered_mode_get_impl(buffered *self); static TyObject * -_io__Buffered_mode_get(TyObject *self, void *Ty_UNUSED(context)) +_io__Buffered_mode_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -545,7 +545,7 @@ static TyObject * _io__Buffered_fileno_impl(buffered *self); static TyObject * -_io__Buffered_fileno(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_fileno(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -568,7 +568,7 @@ static TyObject * _io__Buffered_isatty_impl(buffered *self); static TyObject * -_io__Buffered_isatty(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_isatty(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -591,7 +591,7 @@ static TyObject * _io__Buffered_flush_impl(buffered *self); static TyObject * -_io__Buffered_flush(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_flush(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -840,7 +840,7 @@ static TyObject * _io__Buffered_tell_impl(buffered *self); static TyObject * -_io__Buffered_tell(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__Buffered_tell(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Modules/_io/clinic/bytesio.c.h b/Modules/_io/clinic/bytesio.c.h index 5dc5bc3..9a6837e 100644 --- a/Modules/_io/clinic/bytesio.c.h +++ b/Modules/_io/clinic/bytesio.c.h @@ -22,7 +22,7 @@ static TyObject * _io_BytesIO_readable_impl(bytesio *self); static TyObject * -_io_BytesIO_readable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_BytesIO_readable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_BytesIO_readable_impl((bytesio *)self); } @@ -40,7 +40,7 @@ static TyObject * _io_BytesIO_writable_impl(bytesio *self); static TyObject * -_io_BytesIO_writable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_BytesIO_writable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_BytesIO_writable_impl((bytesio *)self); } @@ -58,7 +58,7 @@ static TyObject * _io_BytesIO_seekable_impl(bytesio *self); static TyObject * -_io_BytesIO_seekable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_BytesIO_seekable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_BytesIO_seekable_impl((bytesio *)self); } @@ -76,7 +76,7 @@ static TyObject * _io_BytesIO_flush_impl(bytesio *self); static TyObject * -_io_BytesIO_flush(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_BytesIO_flush(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_BytesIO_flush_impl((bytesio *)self); } @@ -116,7 +116,7 @@ static TyObject * _io_BytesIO_getvalue_impl(bytesio *self); static TyObject * -_io_BytesIO_getvalue(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_BytesIO_getvalue(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_BytesIO_getvalue_impl((bytesio *)self); } @@ -136,7 +136,7 @@ static TyObject * _io_BytesIO_isatty_impl(bytesio *self); static TyObject * -_io_BytesIO_isatty(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_BytesIO_isatty(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_BytesIO_isatty_impl((bytesio *)self); } @@ -154,7 +154,7 @@ static TyObject * _io_BytesIO_tell_impl(bytesio *self); static TyObject * -_io_BytesIO_tell(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_BytesIO_tell(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_BytesIO_tell_impl((bytesio *)self); } @@ -497,7 +497,7 @@ static TyObject * _io_BytesIO_close_impl(bytesio *self); static TyObject * -_io_BytesIO_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_BytesIO_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_BytesIO_close_impl((bytesio *)self); } diff --git a/Modules/_io/clinic/fileio.c.h b/Modules/_io/clinic/fileio.c.h index d5b13e4..7dcff1b 100644 --- a/Modules/_io/clinic/fileio.c.h +++ b/Modules/_io/clinic/fileio.c.h @@ -153,7 +153,7 @@ static TyObject * _io_FileIO_fileno_impl(fileio *self); static TyObject * -_io_FileIO_fileno(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_FileIO_fileno(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_FileIO_fileno_impl((fileio *)self); } @@ -171,7 +171,7 @@ static TyObject * _io_FileIO_readable_impl(fileio *self); static TyObject * -_io_FileIO_readable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_FileIO_readable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_FileIO_readable_impl((fileio *)self); } @@ -189,7 +189,7 @@ static TyObject * _io_FileIO_writable_impl(fileio *self); static TyObject * -_io_FileIO_writable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_FileIO_writable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_FileIO_writable_impl((fileio *)self); } @@ -207,7 +207,7 @@ static TyObject * _io_FileIO_seekable_impl(fileio *self); static TyObject * -_io_FileIO_seekable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_FileIO_seekable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_FileIO_seekable_impl((fileio *)self); } @@ -283,7 +283,7 @@ static TyObject * _io_FileIO_readall_impl(fileio *self); static TyObject * -_io_FileIO_readall(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_FileIO_readall(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_FileIO_readall_impl((fileio *)self); } @@ -462,7 +462,7 @@ static TyObject * _io_FileIO_tell_impl(fileio *self); static TyObject * -_io_FileIO_tell(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_FileIO_tell(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_FileIO_tell_impl((fileio *)self); } @@ -535,7 +535,7 @@ static TyObject * _io_FileIO_isatty_impl(fileio *self); static TyObject * -_io_FileIO_isatty(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_FileIO_isatty(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_FileIO_isatty_impl((fileio *)self); } diff --git a/Modules/_io/clinic/iobase.c.h b/Modules/_io/clinic/iobase.c.h index 13bd4b3..4efb981 100644 --- a/Modules/_io/clinic/iobase.c.h +++ b/Modules/_io/clinic/iobase.c.h @@ -33,7 +33,7 @@ PyDoc_STRVAR(_io__IOBase_seek__doc__, static TyObject * _io__IOBase_seek_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(offset), int Ty_UNUSED(whence)); + int Py_UNUSED(offset), int Py_UNUSED(whence)); static TyObject * _io__IOBase_seek(TyObject *self, TyTypeObject *cls, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) @@ -92,7 +92,7 @@ static TyObject * _io__IOBase_tell_impl(TyObject *self); static TyObject * -_io__IOBase_tell(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__IOBase_tell(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__IOBase_tell_impl(self); } @@ -111,7 +111,7 @@ PyDoc_STRVAR(_io__IOBase_truncate__doc__, static TyObject * _io__IOBase_truncate_impl(TyObject *self, TyTypeObject *cls, - TyObject *Ty_UNUSED(size)); + TyObject *Py_UNUSED(size)); static TyObject * _io__IOBase_truncate(TyObject *self, TyTypeObject *cls, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) @@ -164,7 +164,7 @@ static TyObject * _io__IOBase_flush_impl(TyObject *self); static TyObject * -_io__IOBase_flush(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__IOBase_flush(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__IOBase_flush_impl(self); } @@ -184,7 +184,7 @@ static TyObject * _io__IOBase_close_impl(TyObject *self); static TyObject * -_io__IOBase_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__IOBase_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__IOBase_close_impl(self); } @@ -205,7 +205,7 @@ static TyObject * _io__IOBase_seekable_impl(TyObject *self); static TyObject * -_io__IOBase_seekable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__IOBase_seekable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__IOBase_seekable_impl(self); } @@ -225,7 +225,7 @@ static TyObject * _io__IOBase_readable_impl(TyObject *self); static TyObject * -_io__IOBase_readable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__IOBase_readable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__IOBase_readable_impl(self); } @@ -245,7 +245,7 @@ static TyObject * _io__IOBase_writable_impl(TyObject *self); static TyObject * -_io__IOBase_writable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__IOBase_writable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__IOBase_writable_impl(self); } @@ -289,7 +289,7 @@ static TyObject * _io__IOBase_isatty_impl(TyObject *self); static TyObject * -_io__IOBase_isatty(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__IOBase_isatty(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__IOBase_isatty_impl(self); } @@ -439,7 +439,7 @@ static TyObject * _io__RawIOBase_readall_impl(TyObject *self); static TyObject * -_io__RawIOBase_readall(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__RawIOBase_readall(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__RawIOBase_readall_impl(self); } diff --git a/Modules/_io/clinic/stringio.c.h b/Modules/_io/clinic/stringio.c.h index d5692cb..ee124b6 100644 --- a/Modules/_io/clinic/stringio.c.h +++ b/Modules/_io/clinic/stringio.c.h @@ -23,7 +23,7 @@ static TyObject * _io_StringIO_getvalue_impl(stringio *self); static TyObject * -_io_StringIO_getvalue(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_StringIO_getvalue(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -47,7 +47,7 @@ static TyObject * _io_StringIO_tell_impl(stringio *self); static TyObject * -_io_StringIO_tell(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_StringIO_tell(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -276,7 +276,7 @@ static TyObject * _io_StringIO_close_impl(stringio *self); static TyObject * -_io_StringIO_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_StringIO_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -373,7 +373,7 @@ static TyObject * _io_StringIO_readable_impl(stringio *self); static TyObject * -_io_StringIO_readable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_StringIO_readable(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -397,7 +397,7 @@ static TyObject * _io_StringIO_writable_impl(stringio *self); static TyObject * -_io_StringIO_writable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_StringIO_writable(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -421,7 +421,7 @@ static TyObject * _io_StringIO_seekable_impl(stringio *self); static TyObject * -_io_StringIO_seekable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_StringIO_seekable(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -444,7 +444,7 @@ static TyObject * _io_StringIO___getstate___impl(stringio *self); static TyObject * -_io_StringIO___getstate__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_StringIO___getstate__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -492,7 +492,7 @@ static TyObject * _io_StringIO_closed_get_impl(stringio *self); static TyObject * -_io_StringIO_closed_get(TyObject *self, void *Ty_UNUSED(context)) +_io_StringIO_closed_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -517,7 +517,7 @@ static TyObject * _io_StringIO_line_buffering_get_impl(stringio *self); static TyObject * -_io_StringIO_line_buffering_get(TyObject *self, void *Ty_UNUSED(context)) +_io_StringIO_line_buffering_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -542,7 +542,7 @@ static TyObject * _io_StringIO_newlines_get_impl(stringio *self); static TyObject * -_io_StringIO_newlines_get(TyObject *self, void *Ty_UNUSED(context)) +_io_StringIO_newlines_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; diff --git a/Modules/_io/clinic/textio.c.h b/Modules/_io/clinic/textio.c.h index 74e40f6..fa794ad 100644 --- a/Modules/_io/clinic/textio.c.h +++ b/Modules/_io/clinic/textio.c.h @@ -48,7 +48,7 @@ PyDoc_STRVAR(_io__TextIOBase_read__doc__, static TyObject * _io__TextIOBase_read_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(size)); + int Py_UNUSED(size)); static TyObject * _io__TextIOBase_read(TyObject *self, TyTypeObject *cls, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) @@ -103,7 +103,7 @@ PyDoc_STRVAR(_io__TextIOBase_readline__doc__, static TyObject * _io__TextIOBase_readline_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(size)); + int Py_UNUSED(size)); static TyObject * _io__TextIOBase_readline(TyObject *self, TyTypeObject *cls, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) @@ -158,7 +158,7 @@ PyDoc_STRVAR(_io__TextIOBase_write__doc__, static TyObject * _io__TextIOBase_write_impl(TyObject *self, TyTypeObject *cls, - const char *Ty_UNUSED(s)); + const char *Py_UNUSED(s)); static TyObject * _io__TextIOBase_write(TyObject *self, TyTypeObject *cls, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) @@ -227,7 +227,7 @@ static TyObject * _io__TextIOBase_encoding_get_impl(TyObject *self); static TyObject * -_io__TextIOBase_encoding_get(TyObject *self, void *Ty_UNUSED(context)) +_io__TextIOBase_encoding_get(TyObject *self, void *Py_UNUSED(context)) { return _io__TextIOBase_encoding_get_impl(self); } @@ -257,7 +257,7 @@ static TyObject * _io__TextIOBase_newlines_get_impl(TyObject *self); static TyObject * -_io__TextIOBase_newlines_get(TyObject *self, void *Ty_UNUSED(context)) +_io__TextIOBase_newlines_get(TyObject *self, void *Py_UNUSED(context)) { return _io__TextIOBase_newlines_get_impl(self); } @@ -285,7 +285,7 @@ static TyObject * _io__TextIOBase_errors_get_impl(TyObject *self); static TyObject * -_io__TextIOBase_errors_get(TyObject *self, void *Ty_UNUSED(context)) +_io__TextIOBase_errors_get(TyObject *self, void *Py_UNUSED(context)) { return _io__TextIOBase_errors_get_impl(self); } @@ -448,7 +448,7 @@ static TyObject * _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self); static TyObject * -_io_IncrementalNewlineDecoder_getstate(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_IncrementalNewlineDecoder_getstate(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_IncrementalNewlineDecoder_getstate_impl((nldecoder_object *)self); } @@ -487,7 +487,7 @@ static TyObject * _io_IncrementalNewlineDecoder_reset_impl(nldecoder_object *self); static TyObject * -_io_IncrementalNewlineDecoder_reset(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_IncrementalNewlineDecoder_reset(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io_IncrementalNewlineDecoder_reset_impl((nldecoder_object *)self); } @@ -766,7 +766,7 @@ static TyObject * _io_TextIOWrapper_detach_impl(textio *self); static TyObject * -_io_TextIOWrapper_detach(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_TextIOWrapper_detach(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -958,7 +958,7 @@ static TyObject * _io_TextIOWrapper_tell_impl(textio *self); static TyObject * -_io_TextIOWrapper_tell(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_TextIOWrapper_tell(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1014,7 +1014,7 @@ static TyObject * _io_TextIOWrapper_fileno_impl(textio *self); static TyObject * -_io_TextIOWrapper_fileno(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_TextIOWrapper_fileno(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1037,7 +1037,7 @@ static TyObject * _io_TextIOWrapper_seekable_impl(textio *self); static TyObject * -_io_TextIOWrapper_seekable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_TextIOWrapper_seekable(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1060,7 +1060,7 @@ static TyObject * _io_TextIOWrapper_readable_impl(textio *self); static TyObject * -_io_TextIOWrapper_readable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_TextIOWrapper_readable(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1083,7 +1083,7 @@ static TyObject * _io_TextIOWrapper_writable_impl(textio *self); static TyObject * -_io_TextIOWrapper_writable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_TextIOWrapper_writable(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1106,7 +1106,7 @@ static TyObject * _io_TextIOWrapper_isatty_impl(textio *self); static TyObject * -_io_TextIOWrapper_isatty(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_TextIOWrapper_isatty(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1129,7 +1129,7 @@ static TyObject * _io_TextIOWrapper_flush_impl(textio *self); static TyObject * -_io_TextIOWrapper_flush(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_TextIOWrapper_flush(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1152,7 +1152,7 @@ static TyObject * _io_TextIOWrapper_close_impl(textio *self); static TyObject * -_io_TextIOWrapper_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io_TextIOWrapper_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1177,7 +1177,7 @@ static TyObject * _io_TextIOWrapper_name_get_impl(textio *self); static TyObject * -_io_TextIOWrapper_name_get(TyObject *self, void *Ty_UNUSED(context)) +_io_TextIOWrapper_name_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1202,7 +1202,7 @@ static TyObject * _io_TextIOWrapper_closed_get_impl(textio *self); static TyObject * -_io_TextIOWrapper_closed_get(TyObject *self, void *Ty_UNUSED(context)) +_io_TextIOWrapper_closed_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1227,7 +1227,7 @@ static TyObject * _io_TextIOWrapper_newlines_get_impl(textio *self); static TyObject * -_io_TextIOWrapper_newlines_get(TyObject *self, void *Ty_UNUSED(context)) +_io_TextIOWrapper_newlines_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1252,7 +1252,7 @@ static TyObject * _io_TextIOWrapper_errors_get_impl(textio *self); static TyObject * -_io_TextIOWrapper_errors_get(TyObject *self, void *Ty_UNUSED(context)) +_io_TextIOWrapper_errors_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1277,7 +1277,7 @@ static TyObject * _io_TextIOWrapper__CHUNK_SIZE_get_impl(textio *self); static TyObject * -_io_TextIOWrapper__CHUNK_SIZE_get(TyObject *self, void *Ty_UNUSED(context)) +_io_TextIOWrapper__CHUNK_SIZE_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1302,7 +1302,7 @@ static int _io_TextIOWrapper__CHUNK_SIZE_set_impl(textio *self, TyObject *value); static int -_io_TextIOWrapper__CHUNK_SIZE_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_io_TextIOWrapper__CHUNK_SIZE_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; diff --git a/Modules/_io/clinic/winconsoleio.c.h b/Modules/_io/clinic/winconsoleio.c.h index 5b8794b..992595e 100644 --- a/Modules/_io/clinic/winconsoleio.c.h +++ b/Modules/_io/clinic/winconsoleio.c.h @@ -156,7 +156,7 @@ static TyObject * _io__WindowsConsoleIO_fileno_impl(winconsoleio *self); static TyObject * -_io__WindowsConsoleIO_fileno(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__WindowsConsoleIO_fileno(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__WindowsConsoleIO_fileno_impl((winconsoleio *)self); } @@ -178,7 +178,7 @@ static TyObject * _io__WindowsConsoleIO_readable_impl(winconsoleio *self); static TyObject * -_io__WindowsConsoleIO_readable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__WindowsConsoleIO_readable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__WindowsConsoleIO_readable_impl((winconsoleio *)self); } @@ -200,7 +200,7 @@ static TyObject * _io__WindowsConsoleIO_writable_impl(winconsoleio *self); static TyObject * -_io__WindowsConsoleIO_writable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__WindowsConsoleIO_writable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__WindowsConsoleIO_writable_impl((winconsoleio *)self); } @@ -281,7 +281,7 @@ static TyObject * _io__WindowsConsoleIO_readall_impl(winconsoleio *self); static TyObject * -_io__WindowsConsoleIO_readall(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__WindowsConsoleIO_readall(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__WindowsConsoleIO_readall_impl((winconsoleio *)self); } @@ -421,7 +421,7 @@ static TyObject * _io__WindowsConsoleIO_isatty_impl(winconsoleio *self); static TyObject * -_io__WindowsConsoleIO_isatty(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_io__WindowsConsoleIO_isatty(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _io__WindowsConsoleIO_isatty_impl((winconsoleio *)self); } diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index 7d5e567..aa73099 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -113,7 +113,7 @@ fileio_dealloc_warn(TyObject *op, TyObject *source) } TyErr_SetRaisedException(exc); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Returns 0 on success, -1 with exception set on failure. */ @@ -694,7 +694,7 @@ _io_FileIO_readinto_impl(fileio *self, TyTypeObject *cls, Ty_buffer *buffer) if (n == -1) { if (err == EAGAIN) { TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return NULL; } @@ -827,7 +827,7 @@ _io_FileIO_readall_impl(fileio *self) if (bytes_read > 0) break; Ty_DECREF(result); - Ty_RETURN_NONE; + Py_RETURN_NONE; } Ty_DECREF(result); return NULL; @@ -894,7 +894,7 @@ _io_FileIO_read_impl(fileio *self, TyTypeObject *cls, Ty_ssize_t size) Ty_DECREF(bytes); if (err == EAGAIN) { TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return NULL; } @@ -943,7 +943,7 @@ _io_FileIO_write_impl(fileio *self, TyTypeObject *cls, Ty_buffer *b) if (n < 0) { if (err == EAGAIN) { TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return NULL; } @@ -1234,11 +1234,11 @@ _io_FileIO_isatty_impl(fileio *self) context TOCTOU issues (the fd could be arbitrarily modified by surrounding code). */ static TyObject * -_io_FileIO_isatty_open_only(TyObject *op, TyObject *Ty_UNUSED(dummy)) +_io_FileIO_isatty_open_only(TyObject *op, TyObject *Py_UNUSED(dummy)) { fileio *self = PyFileIO_CAST(op); if (self->stat_atopen != NULL && !S_ISCHR(self->stat_atopen->st_mode)) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } return _io_FileIO_isatty_impl(self); } @@ -1311,8 +1311,8 @@ static TyGetSetDef fileio_getsetlist[] = { static TyMemberDef fileio_members[] = { {"_finalizing", Ty_T_BOOL, offsetof(fileio, finalizing), 0}, - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(fileio, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(fileio, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(fileio, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(fileio, dict), Py_READONLY}, {NULL} }; diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index 28358cd..f779c31 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -115,7 +115,7 @@ Return the new absolute position. static TyObject * _io__IOBase_seek_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(offset), int Ty_UNUSED(whence)) + int Py_UNUSED(offset), int Py_UNUSED(whence)) /*[clinic end generated code: output=8bd74ea6538ded53 input=74211232b363363e]*/ { _PyIO_State *state = get_io_state_by_cls(cls); @@ -149,7 +149,7 @@ as reported by tell(). Return the new size. static TyObject * _io__IOBase_truncate_impl(TyObject *self, TyTypeObject *cls, - TyObject *Ty_UNUSED(size)) + TyObject *Py_UNUSED(size)) /*[clinic end generated code: output=2013179bff1fe8ef input=660ac20936612c27]*/ { _PyIO_State *state = get_io_state_by_cls(cls); @@ -174,7 +174,7 @@ _io__IOBase_flush_impl(TyObject *self) int closed = iobase_is_closed(self); if (!closed) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (closed > 0) { TyErr_SetString(TyExc_ValueError, "I/O operation on closed file."); @@ -220,7 +220,7 @@ _PyIOBase_check_closed(TyObject *self, TyObject *args) if (args == Ty_True) { return Ty_None; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -274,7 +274,7 @@ _io__IOBase_close_impl(TyObject *self) return NULL; } if (closed) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } rc1 = _PyFile_Flush(self); @@ -285,7 +285,7 @@ _io__IOBase_close_impl(TyObject *self) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Finalization and garbage collection support */ @@ -405,7 +405,7 @@ static TyObject * _io__IOBase_seekable_impl(TyObject *self) /*[clinic end generated code: output=4c24c67f5f32a43d input=b976622f7fdf3063]*/ { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } TyObject * @@ -437,7 +437,7 @@ static TyObject * _io__IOBase_readable_impl(TyObject *self) /*[clinic end generated code: output=e48089250686388b input=285b3b866a0ec35f]*/ { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /* May be called with any object */ @@ -470,7 +470,7 @@ static TyObject * _io__IOBase_writable_impl(TyObject *self) /*[clinic end generated code: output=406001d0985be14f input=9dcac18a013a05b5]*/ { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /* May be called with any object */ @@ -544,7 +544,7 @@ _io__IOBase_isatty_impl(TyObject *self) { if (iobase_check_closed(self)) return NULL; - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /* Readline(s) and writelines */ @@ -821,7 +821,7 @@ _io__IOBase_writelines(TyObject *self, TyObject *lines) Ty_DECREF(res); } Ty_DECREF(iter); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #define clinic_state() (find_io_state_by_def(Ty_TYPE(self))) @@ -864,8 +864,8 @@ static TyGetSetDef iobase_getset[] = { }; static struct TyMemberDef iobase_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(iobase, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(iobase, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(iobase, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(iobase, dict), Py_READONLY}, {NULL}, }; diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index cf5aa0b..ad38766 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -590,7 +590,7 @@ _io_StringIO_close_impl(stringio *self) Ty_CLEAR(self->readnl); Ty_CLEAR(self->writenl); Ty_CLEAR(self->decoder); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -793,7 +793,7 @@ _io_StringIO_readable_impl(stringio *self) { CHECK_INITIALIZED(self); CHECK_CLOSED(self); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -809,7 +809,7 @@ _io_StringIO_writable_impl(stringio *self) { CHECK_INITIALIZED(self); CHECK_CLOSED(self); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -825,7 +825,7 @@ _io_StringIO_seekable_impl(stringio *self) { CHECK_INITIALIZED(self); CHECK_CLOSED(self); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /* Pickling support. @@ -982,7 +982,7 @@ _io_StringIO___setstate___impl(stringio *self, TyObject *state) } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1011,7 +1011,7 @@ _io_StringIO_line_buffering_get_impl(stringio *self) { CHECK_INITIALIZED(self); CHECK_CLOSED(self); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /*[clinic input] @@ -1027,7 +1027,7 @@ _io_StringIO_newlines_get_impl(stringio *self) CHECK_INITIALIZED(self); CHECK_CLOSED(self); if (self->decoder == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return PyObject_GetAttr(self->decoder, &_Ty_ID(newlines)); } @@ -1065,8 +1065,8 @@ static TyGetSetDef stringio_getset[] = { }; static struct TyMemberDef stringio_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(stringio, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(stringio, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(stringio, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(stringio, dict), Py_READONLY}, {NULL}, }; diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index faf84e2..8b20194 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -84,7 +84,7 @@ If size is negative or omitted, read until EOF. static TyObject * _io__TextIOBase_read_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(size)) + int Py_UNUSED(size)) /*[clinic end generated code: output=51a5178a309ce647 input=f5e37720f9fc563f]*/ { _PyIO_State *state = get_io_state_by_cls(cls); @@ -105,7 +105,7 @@ If size is specified, at most size characters will be read. static TyObject * _io__TextIOBase_readline_impl(TyObject *self, TyTypeObject *cls, - int Ty_UNUSED(size)) + int Py_UNUSED(size)) /*[clinic end generated code: output=3f47d7966d6d074e input=42eafec94107fa27]*/ { _PyIO_State *state = get_io_state_by_cls(cls); @@ -126,7 +126,7 @@ Return the number of characters written static TyObject * _io__TextIOBase_write_impl(TyObject *self, TyTypeObject *cls, - const char *Ty_UNUSED(s)) + const char *Py_UNUSED(s)) /*[clinic end generated code: output=18b28231460275de input=e9cabaa5f6732b07]*/ { _PyIO_State *state = get_io_state_by_cls(cls); @@ -146,7 +146,7 @@ static TyObject * _io__TextIOBase_encoding_get_impl(TyObject *self) /*[clinic end generated code: output=e0f5d8f548b92432 input=4736d7621dd38f43]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -164,7 +164,7 @@ static TyObject * _io__TextIOBase_newlines_get_impl(TyObject *self) /*[clinic end generated code: output=46ec147fb9f00c2a input=a5b196d076af1164]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -180,7 +180,7 @@ static TyObject * _io__TextIOBase_errors_get_impl(TyObject *self) /*[clinic end generated code: output=c6623d6addcd087d input=974aa52d1db93a82]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -608,7 +608,7 @@ _io_IncrementalNewlineDecoder_setstate_impl(nldecoder_object *self, "((OK))", buffer, flag); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -627,11 +627,11 @@ _io_IncrementalNewlineDecoder_reset_impl(nldecoder_object *self) if (self->decoder != Ty_None) return PyObject_CallMethodNoArgs(self->decoder, &_Ty_ID(reset)); else - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -incrementalnewlinedecoder_newlines_get(TyObject *op, void *Ty_UNUSED(context)) +incrementalnewlinedecoder_newlines_get(TyObject *op, void *Py_UNUSED(context)) { nldecoder_object *self = nldecoder_object_CAST(op); CHECK_INITIALIZED_DECODER(self); @@ -652,7 +652,7 @@ incrementalnewlinedecoder_newlines_get(TyObject *op, void *Ty_UNUSED(context)) case SEEN_CR | SEEN_LF | SEEN_CRLF: return Ty_BuildValue("sss", "\r", "\n", "\r\n"); default: - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -1001,7 +1001,7 @@ _textiowrapper_fix_encoder_state(textio *self) return -1; } - int cmp = PyObject_RichCompareBool(cookieObj, _TyLong_GetZero(), Ty_EQ); + int cmp = PyObject_RichCompareBool(cookieObj, _TyLong_GetZero(), Py_EQ); Ty_DECREF(cookieObj); if (cmp < 0) { return -1; @@ -1437,7 +1437,7 @@ _io_TextIOWrapper_reconfigure_impl(textio *self, TyObject *encoding, self->line_buffering = line_buffering; self->write_through = write_through; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -2553,7 +2553,7 @@ _io_TextIOWrapper_seek_impl(textio *self, TyObject *cookieObj, int whence) switch (whence) { case SEEK_CUR: /* seek relative to current position */ - cmp = PyObject_RichCompareBool(cookieObj, zero, Ty_EQ); + cmp = PyObject_RichCompareBool(cookieObj, zero, Py_EQ); if (cmp < 0) goto fail; @@ -2573,7 +2573,7 @@ _io_TextIOWrapper_seek_impl(textio *self, TyObject *cookieObj, int whence) case SEEK_END: /* seek relative to end of file */ - cmp = PyObject_RichCompareBool(cookieObj, zero, Ty_EQ); + cmp = PyObject_RichCompareBool(cookieObj, zero, Py_EQ); if (cmp < 0) goto fail; @@ -2601,7 +2601,7 @@ _io_TextIOWrapper_seek_impl(textio *self, TyObject *cookieObj, int whence) goto fail; if (self->encoder) { /* If seek() == 0, we are at the start of stream, otherwise not */ - cmp = PyObject_RichCompareBool(res, zero, Ty_EQ); + cmp = PyObject_RichCompareBool(res, zero, Py_EQ); if (cmp < 0 || _textiowrapper_encoder_reset(self, cmp)) { Ty_DECREF(res); goto fail; @@ -2619,7 +2619,7 @@ _io_TextIOWrapper_seek_impl(textio *self, TyObject *cookieObj, int whence) goto fail; } - cmp = PyObject_RichCompareBool(cookieObj, zero, Ty_LT); + cmp = PyObject_RichCompareBool(cookieObj, zero, Py_LT); if (cmp < 0) goto fail; @@ -3147,7 +3147,7 @@ _io_TextIOWrapper_close_impl(textio *self) return NULL; if (r > 0) { - Ty_RETURN_NONE; /* stream already closed */ + Py_RETURN_NONE; /* stream already closed */ } else { TyObject *exc = NULL; @@ -3266,7 +3266,7 @@ _io_TextIOWrapper_newlines_get_impl(textio *self) if (self->decoder == NULL || PyObject_GetOptionalAttr(self->decoder, &_Ty_ID(newlines), &res) == 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return res; } @@ -3384,13 +3384,13 @@ static TyMethodDef textiowrapper_methods[] = { }; static TyMemberDef textiowrapper_members[] = { - {"encoding", _Ty_T_OBJECT, offsetof(textio, encoding), Ty_READONLY}, - {"buffer", _Ty_T_OBJECT, offsetof(textio, buffer), Ty_READONLY}, - {"line_buffering", Ty_T_BOOL, offsetof(textio, line_buffering), Ty_READONLY}, - {"write_through", Ty_T_BOOL, offsetof(textio, write_through), Ty_READONLY}, + {"encoding", _Ty_T_OBJECT, offsetof(textio, encoding), Py_READONLY}, + {"buffer", _Ty_T_OBJECT, offsetof(textio, buffer), Py_READONLY}, + {"line_buffering", Ty_T_BOOL, offsetof(textio, line_buffering), Py_READONLY}, + {"write_through", Ty_T_BOOL, offsetof(textio, write_through), Py_READONLY}, {"_finalizing", Ty_T_BOOL, offsetof(textio, finalizing), 0}, - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(textio, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(textio, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(textio, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(textio, dict), Py_READONLY}, {NULL} }; diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c index 8066926..18bd0d0 100644 --- a/Modules/_io/winconsoleio.c +++ b/Modules/_io/winconsoleio.c @@ -1178,7 +1178,7 @@ _io__WindowsConsoleIO_isatty_impl(winconsoleio *self) if (self->fd == -1) return err_closed(); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } #define clinic_state() (find_io_state_by_def(Ty_TYPE(self))) @@ -1202,21 +1202,21 @@ static TyMethodDef winconsoleio_methods[] = { /* 'closed' and 'mode' are attributes for compatibility with FileIO. */ static TyObject * -get_closed(TyObject *op, void *Ty_UNUSED(closure)) +get_closed(TyObject *op, void *Py_UNUSED(closure)) { winconsoleio *self = winconsoleio_CAST(op); return TyBool_FromLong((long)(self->fd == -1)); } static TyObject * -get_closefd(TyObject *op, void *Ty_UNUSED(closure)) +get_closefd(TyObject *op, void *Py_UNUSED(closure)) { winconsoleio *self = winconsoleio_CAST(op); return TyBool_FromLong((long)(self->closefd)); } static TyObject * -get_mode(TyObject *op, void *Ty_UNUSED(closure)) +get_mode(TyObject *op, void *Py_UNUSED(closure)) { winconsoleio *self = winconsoleio_CAST(op); return TyUnicode_FromString(self->readable ? "rb" : "wb"); @@ -1233,8 +1233,8 @@ static TyGetSetDef winconsoleio_getsetlist[] = { static TyMemberDef winconsoleio_members[] = { {"_blksize", Ty_T_UINT, offsetof(winconsoleio, blksize), 0}, {"_finalizing", Ty_T_BOOL, offsetof(winconsoleio, finalizing), 0}, - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(winconsoleio, weakreflist), Ty_READONLY}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(winconsoleio, dict), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(winconsoleio, weakreflist), Py_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(winconsoleio, dict), Py_READONLY}, {NULL} }; diff --git a/Modules/_json.c b/Modules/_json.c index c9bd26a..8173f65 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -31,12 +31,12 @@ typedef struct _PyScannerObject { #define PyScannerObject_CAST(op) ((PyScannerObject *)(op)) static TyMemberDef scanner_members[] = { - {"strict", Ty_T_BOOL, offsetof(PyScannerObject, strict), Ty_READONLY, "strict"}, - {"object_hook", _Ty_T_OBJECT, offsetof(PyScannerObject, object_hook), Ty_READONLY, "object_hook"}, - {"object_pairs_hook", _Ty_T_OBJECT, offsetof(PyScannerObject, object_pairs_hook), Ty_READONLY}, - {"parse_float", _Ty_T_OBJECT, offsetof(PyScannerObject, parse_float), Ty_READONLY, "parse_float"}, - {"parse_int", _Ty_T_OBJECT, offsetof(PyScannerObject, parse_int), Ty_READONLY, "parse_int"}, - {"parse_constant", _Ty_T_OBJECT, offsetof(PyScannerObject, parse_constant), Ty_READONLY, "parse_constant"}, + {"strict", Ty_T_BOOL, offsetof(PyScannerObject, strict), Py_READONLY, "strict"}, + {"object_hook", _Ty_T_OBJECT, offsetof(PyScannerObject, object_hook), Py_READONLY, "object_hook"}, + {"object_pairs_hook", _Ty_T_OBJECT, offsetof(PyScannerObject, object_pairs_hook), Py_READONLY}, + {"parse_float", _Ty_T_OBJECT, offsetof(PyScannerObject, parse_float), Py_READONLY, "parse_float"}, + {"parse_int", _Ty_T_OBJECT, offsetof(PyScannerObject, parse_int), Py_READONLY, "parse_int"}, + {"parse_constant", _Ty_T_OBJECT, offsetof(PyScannerObject, parse_constant), Py_READONLY, "parse_constant"}, {NULL} }; @@ -57,14 +57,14 @@ typedef struct _PyEncoderObject { #define PyEncoderObject_CAST(op) ((PyEncoderObject *)(op)) static TyMemberDef encoder_members[] = { - {"markers", _Ty_T_OBJECT, offsetof(PyEncoderObject, markers), Ty_READONLY, "markers"}, - {"default", _Ty_T_OBJECT, offsetof(PyEncoderObject, defaultfn), Ty_READONLY, "default"}, - {"encoder", _Ty_T_OBJECT, offsetof(PyEncoderObject, encoder), Ty_READONLY, "encoder"}, - {"indent", _Ty_T_OBJECT, offsetof(PyEncoderObject, indent), Ty_READONLY, "indent"}, - {"key_separator", _Ty_T_OBJECT, offsetof(PyEncoderObject, key_separator), Ty_READONLY, "key_separator"}, - {"item_separator", _Ty_T_OBJECT, offsetof(PyEncoderObject, item_separator), Ty_READONLY, "item_separator"}, - {"sort_keys", Ty_T_BOOL, offsetof(PyEncoderObject, sort_keys), Ty_READONLY, "sort_keys"}, - {"skipkeys", Ty_T_BOOL, offsetof(PyEncoderObject, skipkeys), Ty_READONLY, "skipkeys"}, + {"markers", _Ty_T_OBJECT, offsetof(PyEncoderObject, markers), Py_READONLY, "markers"}, + {"default", _Ty_T_OBJECT, offsetof(PyEncoderObject, defaultfn), Py_READONLY, "default"}, + {"encoder", _Ty_T_OBJECT, offsetof(PyEncoderObject, encoder), Py_READONLY, "encoder"}, + {"indent", _Ty_T_OBJECT, offsetof(PyEncoderObject, indent), Py_READONLY, "indent"}, + {"key_separator", _Ty_T_OBJECT, offsetof(PyEncoderObject, key_separator), Py_READONLY, "key_separator"}, + {"item_separator", _Ty_T_OBJECT, offsetof(PyEncoderObject, item_separator), Py_READONLY, "item_separator"}, + {"sort_keys", Ty_T_BOOL, offsetof(PyEncoderObject, sort_keys), Py_READONLY, "sort_keys"}, + {"skipkeys", Ty_T_BOOL, offsetof(PyEncoderObject, skipkeys), Py_READONLY, "skipkeys"}, {NULL} }; @@ -73,7 +73,7 @@ static TyMemberDef encoder_members[] = { static TyObject * ascii_escape_unicode(TyObject *pystr); static TyObject * -py_encode_basestring_ascii(TyObject* Ty_UNUSED(self), TyObject *pystr); +py_encode_basestring_ascii(TyObject* Py_UNUSED(self), TyObject *pystr); static TyObject * scan_once_unicode(PyScannerObject *s, TyObject *memo, TyObject *pystr, Ty_ssize_t idx, Ty_ssize_t *next_idx_ptr); @@ -556,7 +556,7 @@ PyDoc_STRVAR(pydoc_scanstring, ); static TyObject * -py_scanstring(TyObject* Ty_UNUSED(self), TyObject *args) +py_scanstring(TyObject* Py_UNUSED(self), TyObject *args) { TyObject *pystr; TyObject *rval; @@ -585,7 +585,7 @@ PyDoc_STRVAR(pydoc_encode_basestring_ascii, ); static TyObject * -py_encode_basestring_ascii(TyObject* Ty_UNUSED(self), TyObject *pystr) +py_encode_basestring_ascii(TyObject* Py_UNUSED(self), TyObject *pystr) { TyObject *rval; /* Return an ASCII-only JSON representation of a Python string */ @@ -610,7 +610,7 @@ PyDoc_STRVAR(pydoc_encode_basestring, ); static TyObject * -py_encode_basestring(TyObject* Ty_UNUSED(self), TyObject *pystr) +py_encode_basestring(TyObject* Py_UNUSED(self), TyObject *pystr) { TyObject *rval; /* Return a JSON representation of a Python string */ @@ -1066,14 +1066,14 @@ scan_once_unicode(PyScannerObject *s, TyObject *memo, TyObject *pystr, Ty_ssize_ /* null */ if ((idx + 3 < length) && TyUnicode_READ(kind, str, idx + 1) == 'u' && TyUnicode_READ(kind, str, idx + 2) == 'l' && TyUnicode_READ(kind, str, idx + 3) == 'l') { *next_idx_ptr = idx + 4; - Ty_RETURN_NONE; + Py_RETURN_NONE; } break; case 't': /* true */ if ((idx + 3 < length) && TyUnicode_READ(kind, str, idx + 1) == 'r' && TyUnicode_READ(kind, str, idx + 2) == 'u' && TyUnicode_READ(kind, str, idx + 3) == 'e') { *next_idx_ptr = idx + 4; - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } break; case 'f': @@ -1083,7 +1083,7 @@ scan_once_unicode(PyScannerObject *s, TyObject *memo, TyObject *pystr, Ty_ssize_ TyUnicode_READ(kind, str, idx + 3) == 's' && TyUnicode_READ(kind, str, idx + 4) == 'e') { *next_idx_ptr = idx + 5; - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } break; case 'N': diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 4d35671..f5d0678 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -879,7 +879,7 @@ _locale_bind_textdomain_codeset_impl(TyObject *module, const char *domain, if (codeset) { return TyUnicode_DecodeLocale(codeset, NULL); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif // HAVE_BIND_TEXTDOMAIN_CODESET diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c index 9cbdc81..6d525f5 100644 --- a/Modules/_lsprof.c +++ b/Modules/_lsprof.c @@ -628,7 +628,7 @@ _lsprof_Profiler__pystart_callback_impl(ProfilerObject *self, TyObject *code, { ptrace_enter_call((TyObject*)self, (void *)code, code); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -649,7 +649,7 @@ _lsprof_Profiler__pythrow_callback_impl(ProfilerObject *self, TyObject *code, { ptrace_enter_call((TyObject*)self, (void *)code, code); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -671,7 +671,7 @@ _lsprof_Profiler__pyreturn_callback_impl(ProfilerObject *self, { ptrace_leave_call((TyObject*)self, (void *)code); - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject* get_cfunc_from_callable(TyObject* callable, TyObject* self_arg, TyObject* missing) @@ -729,7 +729,7 @@ _lsprof_Profiler__ccall_callback_impl(ProfilerObject *self, TyObject *code, Ty_DECREF(cfunc); } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -759,7 +759,7 @@ _lsprof_Profiler__creturn_callback_impl(ProfilerObject *self, TyObject *code, Ty_DECREF(cfunc); } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static const struct { @@ -844,7 +844,7 @@ _lsprof_Profiler_enable_impl(ProfilerObject *self, int subcalls, Ty_DECREF(monitoring); self->flags |= POF_ENABLED; - Ty_RETURN_NONE; + Py_RETURN_NONE; error: Ty_DECREF(monitoring); @@ -924,7 +924,7 @@ _lsprof_Profiler_disable_impl(ProfilerObject *self) if (pending_exception(self)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -943,7 +943,7 @@ _lsprof_Profiler_clear_impl(ProfilerObject *self) return NULL; } clearEntries(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c index 7c3e6b7..10aa5e3 100644 --- a/Modules/_lzmamodule.c +++ b/Modules/_lzmamodule.c @@ -1352,13 +1352,13 @@ PyDoc_STRVAR(Decompressor_unused_data_doc, "Data found after the end of the compressed stream."); static TyMemberDef Decompressor_members[] = { - {"check", Ty_T_INT, offsetof(Decompressor, check), Ty_READONLY, + {"check", Ty_T_INT, offsetof(Decompressor, check), Py_READONLY, Decompressor_check_doc}, - {"eof", Ty_T_BOOL, offsetof(Decompressor, eof), Ty_READONLY, + {"eof", Ty_T_BOOL, offsetof(Decompressor, eof), Py_READONLY, Decompressor_eof_doc}, - {"needs_input", Ty_T_BOOL, offsetof(Decompressor, needs_input), Ty_READONLY, + {"needs_input", Ty_T_BOOL, offsetof(Decompressor, needs_input), Py_READONLY, Decompressor_needs_input_doc}, - {"unused_data", Ty_T_OBJECT_EX, offsetof(Decompressor, unused_data), Ty_READONLY, + {"unused_data", Ty_T_OBJECT_EX, offsetof(Decompressor, unused_data), Py_READONLY, Decompressor_unused_data_doc}, {NULL} }; diff --git a/Modules/_multiprocessing/clinic/semaphore.c.h b/Modules/_multiprocessing/clinic/semaphore.c.h index 2da8700..74a02c9 100644 --- a/Modules/_multiprocessing/clinic/semaphore.c.h +++ b/Modules/_multiprocessing/clinic/semaphore.c.h @@ -104,7 +104,7 @@ static TyObject * _multiprocessing_SemLock_release_impl(SemLockObject *self); static TyObject * -_multiprocessing_SemLock_release(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multiprocessing_SemLock_release(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -212,7 +212,7 @@ static TyObject * _multiprocessing_SemLock_release_impl(SemLockObject *self); static TyObject * -_multiprocessing_SemLock_release(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multiprocessing_SemLock_release(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -364,7 +364,7 @@ static TyObject * _multiprocessing_SemLock__count_impl(SemLockObject *self); static TyObject * -_multiprocessing_SemLock__count(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multiprocessing_SemLock__count(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -392,7 +392,7 @@ static TyObject * _multiprocessing_SemLock__is_mine_impl(SemLockObject *self); static TyObject * -_multiprocessing_SemLock__is_mine(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multiprocessing_SemLock__is_mine(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _multiprocessing_SemLock__is_mine_impl((SemLockObject *)self); } @@ -414,7 +414,7 @@ static TyObject * _multiprocessing_SemLock__get_value_impl(SemLockObject *self); static TyObject * -_multiprocessing_SemLock__get_value(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multiprocessing_SemLock__get_value(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _multiprocessing_SemLock__get_value_impl((SemLockObject *)self); } @@ -436,7 +436,7 @@ static TyObject * _multiprocessing_SemLock__is_zero_impl(SemLockObject *self); static TyObject * -_multiprocessing_SemLock__is_zero(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multiprocessing_SemLock__is_zero(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _multiprocessing_SemLock__is_zero_impl((SemLockObject *)self); } @@ -458,7 +458,7 @@ static TyObject * _multiprocessing_SemLock__after_fork_impl(SemLockObject *self); static TyObject * -_multiprocessing_SemLock__after_fork(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multiprocessing_SemLock__after_fork(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _multiprocessing_SemLock__after_fork_impl((SemLockObject *)self); } @@ -480,7 +480,7 @@ static TyObject * _multiprocessing_SemLock___enter___impl(SemLockObject *self); static TyObject * -_multiprocessing_SemLock___enter__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multiprocessing_SemLock___enter__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c index fa87966..082aeca 100644 --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -93,7 +93,7 @@ _multiprocessing_closesocket_impl(TyObject *module, HANDLE handle) if (ret) return TyErr_SetExcFromWindowsErr(TyExc_OSError, WSAGetLastError()); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Modules/_multiprocessing/posixshmem.c b/Modules/_multiprocessing/posixshmem.c index a22ad7e..9f7d709 100644 --- a/Modules/_multiprocessing/posixshmem.c +++ b/Modules/_multiprocessing/posixshmem.c @@ -114,7 +114,7 @@ _posixshmem_shm_unlink_impl(TyObject *module, TyObject *path) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* HAVE_SHM_UNLINK */ diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c index 169ab3b..0da3a95 100644 --- a/Modules/_multiprocessing/semaphore.c +++ b/Modules/_multiprocessing/semaphore.c @@ -125,14 +125,14 @@ _multiprocessing_SemLock_acquire_impl(SemLockObject *self, int blocking, /* check whether we already own the lock */ if (self->kind == RECURSIVE_MUTEX && ISMINE(self)) { ++self->count; - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /* check whether we can acquire without releasing the GIL and blocking */ if (WaitForSingleObjectEx(self->handle, 0, FALSE) == WAIT_OBJECT_0) { self->last_tid = GetCurrentThreadId(); ++self->count; - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /* prepare list of handles */ @@ -157,11 +157,11 @@ _multiprocessing_SemLock_acquire_impl(SemLockObject *self, int blocking, /* handle result */ switch (res) { case WAIT_TIMEOUT: - Ty_RETURN_FALSE; + Py_RETURN_FALSE; case WAIT_OBJECT_0 + 0: self->last_tid = GetCurrentThreadId(); ++self->count; - Ty_RETURN_TRUE; + Py_RETURN_TRUE; case WAIT_OBJECT_0 + 1: errno = EINTR; return TyErr_SetFromErrno(TyExc_OSError); @@ -195,7 +195,7 @@ _multiprocessing_SemLock_release_impl(SemLockObject *self) } if (self->count > 1) { --self->count; - Ty_RETURN_NONE; + Py_RETURN_NONE; } assert(self->count == 1); } @@ -211,7 +211,7 @@ _multiprocessing_SemLock_release_impl(SemLockObject *self) } --self->count; - Ty_RETURN_NONE; + Py_RETURN_NONE; } #else /* !MS_WINDOWS */ @@ -321,7 +321,7 @@ _multiprocessing_SemLock_acquire_impl(SemLockObject *self, int blocking, if (self->kind == RECURSIVE_MUTEX && ISMINE(self)) { ++self->count; - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } int use_deadline = (timeout_obj != Ty_None); @@ -374,7 +374,7 @@ _multiprocessing_SemLock_acquire_impl(SemLockObject *self, int blocking, if (res < 0) { errno = err; if (errno == EAGAIN || errno == ETIMEDOUT) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; else if (errno == EINTR) return NULL; else @@ -384,7 +384,7 @@ _multiprocessing_SemLock_acquire_impl(SemLockObject *self, int blocking, ++self->count; self->last_tid = PyThread_get_thread_ident(); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -407,7 +407,7 @@ _multiprocessing_SemLock_release_impl(SemLockObject *self) } if (self->count > 1) { --self->count; - Ty_RETURN_NONE; + Py_RETURN_NONE; } assert(self->count == 1); } else { @@ -452,7 +452,7 @@ _multiprocessing_SemLock_release_impl(SemLockObject *self) return TyErr_SetFromErrno(TyExc_OSError); --self->count; - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* !MS_WINDOWS */ @@ -656,12 +656,12 @@ _multiprocessing_SemLock__is_zero_impl(SemLockObject *self) #ifdef HAVE_BROKEN_SEM_GETVALUE if (sem_trywait(self->handle) < 0) { if (errno == EAGAIN) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; return _PyMp_SetError(NULL, MP_STANDARD_ERROR); } else { if (sem_post(self->handle) < 0) return _PyMp_SetError(NULL, MP_STANDARD_ERROR); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } #else int sval; @@ -682,7 +682,7 @@ _multiprocessing_SemLock__after_fork_impl(SemLockObject *self) /*[clinic end generated code: output=718bb27914c6a6c1 input=190991008a76621e]*/ { self->count = 0; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -750,13 +750,13 @@ static TyMethodDef semlock_methods[] = { */ static TyMemberDef semlock_members[] = { - {"handle", T_SEM_HANDLE, offsetof(SemLockObject, handle), Ty_READONLY, + {"handle", T_SEM_HANDLE, offsetof(SemLockObject, handle), Py_READONLY, ""}, - {"kind", Ty_T_INT, offsetof(SemLockObject, kind), Ty_READONLY, + {"kind", Ty_T_INT, offsetof(SemLockObject, kind), Py_READONLY, ""}, - {"maxvalue", Ty_T_INT, offsetof(SemLockObject, maxvalue), Ty_READONLY, + {"maxvalue", Ty_T_INT, offsetof(SemLockObject, maxvalue), Py_READONLY, ""}, - {"name", Ty_T_STRING, offsetof(SemLockObject, name), Ty_READONLY, + {"name", Ty_T_STRING, offsetof(SemLockObject, name), Py_READONLY, ""}, {NULL} }; @@ -799,7 +799,7 @@ _PyMp_sem_unlink(const char *name) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif // HAVE_MP_SEMAPHORE diff --git a/Modules/_opcode.c b/Modules/_opcode.c index 01d9919..f7b0188 100644 --- a/Modules/_opcode.c +++ b/Modules/_opcode.c @@ -217,7 +217,7 @@ _opcode_get_specialization_stats_impl(TyObject *module) #ifdef Ty_STATS return _Ty_GetSpecializationStats(); #else - Ty_RETURN_NONE; + Py_RETURN_NONE; #endif } diff --git a/Modules/_operator.c b/Modules/_operator.c index 6c3cb53..a962620 100644 --- a/Modules/_operator.c +++ b/Modules/_operator.c @@ -559,7 +559,7 @@ _operator_setitem_impl(TyObject *module, TyObject *a, TyObject *b, { if (-1 == PyObject_SetItem(a, b, c)) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -574,7 +574,7 @@ _operator_delitem_impl(TyObject *module, TyObject *a, TyObject *b) { if (-1 == PyObject_DelItem(a, b)) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -591,7 +591,7 @@ static TyObject * _operator_eq_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=8d7d46ed4135677c input=586fca687a95a83f]*/ { - return PyObject_RichCompare(a, b, Ty_EQ); + return PyObject_RichCompare(a, b, Py_EQ); } /*[clinic input] @@ -604,7 +604,7 @@ static TyObject * _operator_ne_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=c99bd0c3a4c01297 input=5d88f23d35e9abac]*/ { - return PyObject_RichCompare(a, b, Ty_NE); + return PyObject_RichCompare(a, b, Py_NE); } /*[clinic input] @@ -617,7 +617,7 @@ static TyObject * _operator_lt_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=082d7c45c440e535 input=34a59ad6d39d3a2b]*/ { - return PyObject_RichCompare(a, b, Ty_LT); + return PyObject_RichCompare(a, b, Py_LT); } /*[clinic input] @@ -630,7 +630,7 @@ static TyObject * _operator_le_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=00970a2923d0ae17 input=b812a7860a0bef44]*/ { - return PyObject_RichCompare(a, b, Ty_LE); + return PyObject_RichCompare(a, b, Py_LE); } /*[clinic input] @@ -643,7 +643,7 @@ static TyObject * _operator_gt_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=8d373349ecf25641 input=9bdb45b995ada35b]*/ { - return PyObject_RichCompare(a, b, Ty_GT); + return PyObject_RichCompare(a, b, Py_GT); } /*[clinic input] @@ -656,7 +656,7 @@ static TyObject * _operator_ge_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=7ce3882256d4b137 input=cf1dc4a5ca9c35f5]*/ { - return PyObject_RichCompare(a, b, Ty_GE); + return PyObject_RichCompare(a, b, Py_GE); } /*[clinic input] @@ -1001,7 +1001,7 @@ static struct TyMethodDef operator_methods[] = { static TyObject * -text_signature(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +text_signature(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyUnicode_FromString("(obj, /)"); } @@ -1189,7 +1189,7 @@ itemgetter_repr(TyObject *op) } static TyObject * -itemgetter_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +itemgetter_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { itemgetterobject *ig = itemgetterobject_CAST(op); if (ig->nitems == 1) @@ -1206,7 +1206,7 @@ static TyMethodDef itemgetter_methods[] = { }; static TyMemberDef itemgetter_members[] = { - {"__vectorcalloffset__", Ty_T_PYSSIZET, offsetof(itemgetterobject, vectorcall), Ty_READONLY}, + {"__vectorcalloffset__", Ty_T_PYSSIZET, offsetof(itemgetterobject, vectorcall), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -1555,7 +1555,7 @@ attrgetter_repr(TyObject *op) } static TyObject * -attrgetter_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +attrgetter_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { attrgetterobject *ag = attrgetterobject_CAST(op); TyObject *attrstrings = attrgetter_args(ag); @@ -1571,7 +1571,7 @@ static TyMethodDef attrgetter_methods[] = { }; static TyMemberDef attrgetter_members[] = { - {"__vectorcalloffset__", Ty_T_PYSSIZET, offsetof(attrgetterobject, vectorcall), Ty_READONLY}, + {"__vectorcalloffset__", Ty_T_PYSSIZET, offsetof(attrgetterobject, vectorcall), Py_READONLY}, {NULL} /* Sentinel*/ }; @@ -1872,7 +1872,7 @@ done: } static TyObject * -methodcaller_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +methodcaller_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { methodcallerobject *mc = methodcallerobject_CAST(op); if (!mc->kwds || TyDict_GET_SIZE(mc->kwds) == 0) { @@ -1913,7 +1913,7 @@ static TyMethodDef methodcaller_methods[] = { }; static TyMemberDef methodcaller_members[] = { - {"__vectorcalloffset__", Ty_T_PYSSIZET, offsetof(methodcallerobject, vectorcall), Ty_READONLY}, + {"__vectorcalloffset__", Ty_T_PYSSIZET, offsetof(methodcallerobject, vectorcall), Py_READONLY}, {NULL} }; diff --git a/Modules/_pickle.c b/Modules/_pickle.c index e0b3b2a..af6b07c 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -4573,7 +4573,7 @@ save(PickleState *st, PicklerObject *self, TyObject *obj, int pers_save) static TyObject * persistent_id(TyObject *self, TyObject *obj) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -4656,7 +4656,7 @@ _pickle_Pickler_clear_memo_impl(PicklerObject *self) if (self->memo) PyMemoTable_Clear(self->memo); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -4695,7 +4695,7 @@ _pickle_Pickler_dump_impl(PicklerObject *self, TyTypeObject *cls, if (_Pickler_FlushToFile(self) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -4902,7 +4902,7 @@ _pickle_PicklerMemoProxy_clear_impl(PicklerMemoProxyObject *self) { if (self->pickler->memo) PyMemoTable_Clear(self->pickler->memo); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -5050,14 +5050,14 @@ PicklerMemoProxy_New(PicklerObject *pickler) /*****************************************************************************/ static TyObject * -Pickler_get_memo(TyObject *op, void *Ty_UNUSED(closure)) +Pickler_get_memo(TyObject *op, void *Py_UNUSED(closure)) { PicklerObject *self = PicklerObject_CAST(op); return PicklerMemoProxy_New(self); } static int -Pickler_set_memo(TyObject *op, TyObject *obj, void *Ty_UNUSED(closure)) +Pickler_set_memo(TyObject *op, TyObject *obj, void *Py_UNUSED(closure)) { PyMemoTable *new_memo = NULL; PicklerObject *self = PicklerObject_CAST(op); @@ -7401,7 +7401,7 @@ _pickle_UnpicklerMemoProxy_clear_impl(UnpicklerMemoProxyObject *self) self->unpickler->memo = _Unpickler_NewMemo(self->unpickler->memo_size); if (self->unpickler->memo == NULL) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -7545,14 +7545,14 @@ UnpicklerMemoProxy_New(UnpicklerObject *unpickler) static TyObject * -Unpickler_get_memo(TyObject *op, void *Ty_UNUSED(closure)) +Unpickler_get_memo(TyObject *op, void *Py_UNUSED(closure)) { UnpicklerObject *self = UnpicklerObject_CAST(op); return UnpicklerMemoProxy_New(self); } static int -Unpickler_set_memo(TyObject *op, TyObject *obj, void *Ty_UNUSED(closure)) +Unpickler_set_memo(TyObject *op, TyObject *obj, void *Py_UNUSED(closure)) { TyObject **new_memo; UnpicklerObject *self = UnpicklerObject_CAST(op); @@ -7755,7 +7755,7 @@ _pickle_dump_impl(TyObject *module, TyObject *obj, TyObject *file, goto error; Ty_DECREF(pickler); - Ty_RETURN_NONE; + Py_RETURN_NONE; error: Ty_XDECREF(pickler); diff --git a/Modules/_queuemodule.c b/Modules/_queuemodule.c index b1a2af6..61d48ea 100644 --- a/Modules/_queuemodule.c +++ b/Modules/_queuemodule.c @@ -321,7 +321,7 @@ _queue_SimpleQueue_put_impl(simplequeueobject *self, TyObject *item, return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -540,7 +540,7 @@ static TyMethodDef simplequeue_methods[] = { }; static struct TyMemberDef simplequeue_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(simplequeueobject, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(simplequeueobject, weakreflist), Py_READONLY}, {NULL}, }; diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index a695710..653cbb3 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -399,7 +399,7 @@ _random_Random_seed_impl(RandomObject *self, TyObject *n) if (random_seed(self, n) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -489,7 +489,7 @@ _random_Random_setstate_impl(RandomObject *self, TyObject *state) for (i = 0; i < N; i++) self->state[i] = new_state[i]; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c index 204678b..28a10fc 100644 --- a/Modules/_scproxy.c +++ b/Modules/_scproxy.c @@ -58,7 +58,7 @@ cfstring_to_pystring(CFStringRef ref) static TyObject* -get_proxy_settings(TyObject* Ty_UNUSED(mod), TyObject *Ty_UNUSED(ignored)) +get_proxy_settings(TyObject* Py_UNUSED(mod), TyObject *Py_UNUSED(ignored)) { CFDictionaryRef proxyDict = NULL; CFNumberRef aNum = NULL; @@ -72,7 +72,7 @@ get_proxy_settings(TyObject* Ty_UNUSED(mod), TyObject *Ty_UNUSED(ignored)) Ty_END_ALLOW_THREADS if (!proxyDict) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } result = TyDict_New(); @@ -170,7 +170,7 @@ set_proxy(TyObject* proxies, const char* proto, CFDictionaryRef proxyDict, static TyObject* -get_proxies(TyObject* Ty_UNUSED(mod), TyObject *Ty_UNUSED(ignored)) +get_proxies(TyObject* Py_UNUSED(mod), TyObject *Py_UNUSED(ignored)) { TyObject* result = NULL; int r; diff --git a/Modules/_sqlite/blob.c b/Modules/_sqlite/blob.c index 2a2ec4f..984946e 100644 --- a/Modules/_sqlite/blob.c +++ b/Modules/_sqlite/blob.c @@ -97,7 +97,7 @@ blob_close_impl(pysqlite_Blob *self) return NULL; } close_blob(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; }; void @@ -256,7 +256,7 @@ blob_write_impl(pysqlite_Blob *self, Ty_buffer *data) return NULL; } self->offset += (int)data->len; - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -311,7 +311,7 @@ blob_seek_impl(pysqlite_Blob *self, int offset, int origin) } self->offset = offset; - Ty_RETURN_NONE; + Py_RETURN_NONE; overflow: TyErr_SetString(TyExc_OverflowError, "seek offset results in overflow"); @@ -373,7 +373,7 @@ blob_exit_impl(pysqlite_Blob *self, TyObject *type, TyObject *val, return NULL; } close_blob(self); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static Ty_ssize_t @@ -583,7 +583,7 @@ static TyMethodDef blob_methods[] = { }; static struct TyMemberDef blob_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(pysqlite_Blob, in_weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(pysqlite_Blob, in_weakreflist), Py_READONLY}, {NULL}, }; diff --git a/Modules/_sqlite/clinic/blob.c.h b/Modules/_sqlite/clinic/blob.c.h index 2ea2fcc..b4ba558 100644 --- a/Modules/_sqlite/clinic/blob.c.h +++ b/Modules/_sqlite/clinic/blob.c.h @@ -17,7 +17,7 @@ static TyObject * blob_close_impl(pysqlite_Blob *self); static TyObject * -blob_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +blob_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return blob_close_impl((pysqlite_Blob *)self); } @@ -156,7 +156,7 @@ static TyObject * blob_tell_impl(pysqlite_Blob *self); static TyObject * -blob_tell(TyObject *self, TyObject *Ty_UNUSED(ignored)) +blob_tell(TyObject *self, TyObject *Py_UNUSED(ignored)) { return blob_tell_impl((pysqlite_Blob *)self); } @@ -174,7 +174,7 @@ static TyObject * blob_enter_impl(pysqlite_Blob *self); static TyObject * -blob_enter(TyObject *self, TyObject *Ty_UNUSED(ignored)) +blob_enter(TyObject *self, TyObject *Py_UNUSED(ignored)) { return blob_enter_impl((pysqlite_Blob *)self); } diff --git a/Modules/_sqlite/clinic/connection.c.h b/Modules/_sqlite/clinic/connection.c.h index f959951..9bf24d3 100644 --- a/Modules/_sqlite/clinic/connection.c.h +++ b/Modules/_sqlite/clinic/connection.c.h @@ -378,7 +378,7 @@ static TyObject * pysqlite_connection_close_impl(pysqlite_Connection *self); static TyObject * -pysqlite_connection_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pysqlite_connection_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pysqlite_connection_close_impl((pysqlite_Connection *)self); } @@ -398,7 +398,7 @@ static TyObject * pysqlite_connection_commit_impl(pysqlite_Connection *self); static TyObject * -pysqlite_connection_commit(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pysqlite_connection_commit(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pysqlite_connection_commit_impl((pysqlite_Connection *)self); } @@ -418,7 +418,7 @@ static TyObject * pysqlite_connection_rollback_impl(pysqlite_Connection *self); static TyObject * -pysqlite_connection_rollback(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pysqlite_connection_rollback(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pysqlite_connection_rollback_impl((pysqlite_Connection *)self); } @@ -1240,7 +1240,7 @@ static TyObject * pysqlite_connection_interrupt_impl(pysqlite_Connection *self); static TyObject * -pysqlite_connection_interrupt(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pysqlite_connection_interrupt(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pysqlite_connection_interrupt_impl((pysqlite_Connection *)self); } @@ -1706,7 +1706,7 @@ static TyObject * pysqlite_connection_enter_impl(pysqlite_Connection *self); static TyObject * -pysqlite_connection_enter(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pysqlite_connection_enter(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pysqlite_connection_enter_impl((pysqlite_Connection *)self); } diff --git a/Modules/_sqlite/clinic/cursor.c.h b/Modules/_sqlite/clinic/cursor.c.h index 9bef7d3..e8971fa 100644 --- a/Modules/_sqlite/clinic/cursor.c.h +++ b/Modules/_sqlite/clinic/cursor.c.h @@ -163,7 +163,7 @@ static TyObject * pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self); static TyObject * -pysqlite_cursor_fetchone(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pysqlite_cursor_fetchone(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pysqlite_cursor_fetchone_impl((pysqlite_Cursor *)self); } @@ -250,7 +250,7 @@ static TyObject * pysqlite_cursor_fetchall_impl(pysqlite_Cursor *self); static TyObject * -pysqlite_cursor_fetchall(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pysqlite_cursor_fetchall(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pysqlite_cursor_fetchall_impl((pysqlite_Cursor *)self); } @@ -325,7 +325,7 @@ static TyObject * pysqlite_cursor_close_impl(pysqlite_Cursor *self); static TyObject * -pysqlite_cursor_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pysqlite_cursor_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pysqlite_cursor_close_impl((pysqlite_Cursor *)self); } diff --git a/Modules/_sqlite/clinic/row.c.h b/Modules/_sqlite/clinic/row.c.h index 1746293..6c30802 100644 --- a/Modules/_sqlite/clinic/row.c.h +++ b/Modules/_sqlite/clinic/row.c.h @@ -52,7 +52,7 @@ static TyObject * pysqlite_row_keys_impl(pysqlite_Row *self); static TyObject * -pysqlite_row_keys(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pysqlite_row_keys(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pysqlite_row_keys_impl((pysqlite_Row *)self); } diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 80b69b4..8f6d957 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -676,7 +676,7 @@ pysqlite_connection_close_impl(pysqlite_Connection *self) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* @@ -733,7 +733,7 @@ pysqlite_connection_commit_impl(pysqlite_Connection *self) return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -767,7 +767,7 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self) return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -1204,7 +1204,7 @@ pysqlite_connection_create_function_impl(pysqlite_Connection *self, TyErr_SetString(self->OperationalError, "Error creating function"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef HAVE_WINDOW_FUNCTIONS @@ -1358,7 +1358,7 @@ create_window_function_impl(pysqlite_Connection *self, TyTypeObject *cls, set_error_from_code(self->state, rc); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -1405,7 +1405,7 @@ pysqlite_connection_create_aggregate_impl(pysqlite_Connection *self, TyErr_SetString(self->OperationalError, "Error creating aggregate"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -1565,7 +1565,7 @@ pysqlite_connection_set_authorizer_impl(pysqlite_Connection *self, set_callback_context(&self->authorizer_ctx, NULL); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1609,7 +1609,7 @@ pysqlite_connection_set_progress_handler_impl(pysqlite_Connection *self, sqlite3_progress_handler(self->db, n, progress_callback, ctx); set_callback_context(&self->progress_ctx, ctx); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1652,7 +1652,7 @@ pysqlite_connection_set_trace_callback_impl(pysqlite_Connection *self, set_callback_context(&self->trace_ctx, ctx); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef PY_SQLITE_ENABLE_LOAD_EXTENSION @@ -1688,7 +1688,7 @@ pysqlite_connection_enable_load_extension_impl(pysqlite_Connection *self, "Error enabling load extension"); return NULL; } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -1725,7 +1725,7 @@ pysqlite_connection_load_extension_impl(pysqlite_Connection *self, TyErr_SetString(self->OperationalError, errmsg); return NULL; } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } #endif @@ -1746,7 +1746,7 @@ int pysqlite_check_thread(pysqlite_Connection* self) } static TyObject * -pysqlite_connection_get_isolation_level(TyObject *op, void *Ty_UNUSED(closure)) +pysqlite_connection_get_isolation_level(TyObject *op, void *Py_UNUSED(closure)) { pysqlite_Connection *self = _pysqlite_Connection_CAST(op); if (!pysqlite_check_connection(self)) { @@ -1755,11 +1755,11 @@ pysqlite_connection_get_isolation_level(TyObject *op, void *Ty_UNUSED(closure)) if (self->isolation_level != NULL) { return TyUnicode_FromString(self->isolation_level); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -pysqlite_connection_get_total_changes(TyObject *op, void *Ty_UNUSED(closure)) +pysqlite_connection_get_total_changes(TyObject *op, void *Py_UNUSED(closure)) { pysqlite_Connection *self = _pysqlite_Connection_CAST(op); if (!pysqlite_check_connection(self)) { @@ -1769,22 +1769,22 @@ pysqlite_connection_get_total_changes(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -pysqlite_connection_get_in_transaction(TyObject *op, void *Ty_UNUSED(closure)) +pysqlite_connection_get_in_transaction(TyObject *op, void *Py_UNUSED(closure)) { pysqlite_Connection *self = _pysqlite_Connection_CAST(op); if (!pysqlite_check_connection(self)) { return NULL; } if (!sqlite3_get_autocommit(self->db)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static int pysqlite_connection_set_isolation_level(TyObject *op, TyObject *isolation_level, - void *Ty_UNUSED(ignored)) + void *Py_UNUSED(ignored)) { pysqlite_Connection *self = _pysqlite_Connection_CAST(op); if (isolation_level == NULL) { @@ -2155,7 +2155,7 @@ pysqlite_connection_backup_impl(pysqlite_Connection *self, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2213,7 +2213,7 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef PY_SQLITE_HAVE_SERIALIZE @@ -2330,7 +2330,7 @@ deserialize_impl(pysqlite_Connection *self, Ty_buffer *data, set_error_from_db(self->state, self->db); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif // PY_SQLITE_HAVE_SERIALIZE @@ -2400,7 +2400,7 @@ pysqlite_connection_exit_impl(pysqlite_Connection *self, TyObject *exc_type, } Ty_DECREF(result); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /*[clinic input] @@ -2529,7 +2529,7 @@ setconfig_impl(pysqlite_Connection *self, int op, int enable) TyErr_SetString(self->state->OperationalError, "Unable to set config"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2564,23 +2564,23 @@ getconfig_impl(pysqlite_Connection *self, int op) } static TyObject * -get_autocommit(TyObject *op, void *Ty_UNUSED(closure)) +get_autocommit(TyObject *op, void *Py_UNUSED(closure)) { pysqlite_Connection *self = _pysqlite_Connection_CAST(op); if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) { return NULL; } if (self->autocommit == AUTOCOMMIT_ENABLED) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } if (self->autocommit == AUTOCOMMIT_DISABLED) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } return TyLong_FromLong(LEGACY_TRANSACTION_CONTROL); } static int -set_autocommit(TyObject *op, TyObject *val, void *Ty_UNUSED(closure)) +set_autocommit(TyObject *op, TyObject *val, void *Py_UNUSED(closure)) { pysqlite_Connection *self = _pysqlite_Connection_CAST(op); if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) { @@ -2607,7 +2607,7 @@ set_autocommit(TyObject *op, TyObject *val, void *Ty_UNUSED(closure)) } static TyObject * -get_sig(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +get_sig(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyUnicode_FromString("(sql, /)"); } @@ -2660,16 +2660,16 @@ static TyMethodDef connection_methods[] = { static struct TyMemberDef connection_members[] = { - {"Warning", _Ty_T_OBJECT, offsetof(pysqlite_Connection, Warning), Ty_READONLY}, - {"Error", _Ty_T_OBJECT, offsetof(pysqlite_Connection, Error), Ty_READONLY}, - {"InterfaceError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, InterfaceError), Ty_READONLY}, - {"DatabaseError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, DatabaseError), Ty_READONLY}, - {"DataError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, DataError), Ty_READONLY}, - {"OperationalError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, OperationalError), Ty_READONLY}, - {"IntegrityError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, IntegrityError), Ty_READONLY}, - {"InternalError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, InternalError), Ty_READONLY}, - {"ProgrammingError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, ProgrammingError), Ty_READONLY}, - {"NotSupportedError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, NotSupportedError), Ty_READONLY}, + {"Warning", _Ty_T_OBJECT, offsetof(pysqlite_Connection, Warning), Py_READONLY}, + {"Error", _Ty_T_OBJECT, offsetof(pysqlite_Connection, Error), Py_READONLY}, + {"InterfaceError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, InterfaceError), Py_READONLY}, + {"DatabaseError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, DatabaseError), Py_READONLY}, + {"DataError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, DataError), Py_READONLY}, + {"OperationalError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, OperationalError), Py_READONLY}, + {"IntegrityError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, IntegrityError), Py_READONLY}, + {"InternalError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, InternalError), Py_READONLY}, + {"ProgrammingError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, ProgrammingError), Py_READONLY}, + {"NotSupportedError", _Ty_T_OBJECT, offsetof(pysqlite_Connection, NotSupportedError), Py_READONLY}, {"row_factory", _Ty_T_OBJECT, offsetof(pysqlite_Connection, row_factory)}, {"text_factory", _Ty_T_OBJECT, offsetof(pysqlite_Connection, text_factory)}, {NULL} diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 29f85bd..9941549 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -1150,7 +1150,7 @@ pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self) row = pysqlite_cursor_iternext((TyObject *)self); if (!row && !TyErr_Occurred()) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return row; @@ -1245,7 +1245,7 @@ static TyObject * pysqlite_cursor_setinputsizes_impl(pysqlite_Cursor *self, TyObject *sizes) /*[clinic end generated code: output=a06c12790bd05f2e input=de7950a3aec79bdf]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1263,7 +1263,7 @@ pysqlite_cursor_setoutputsize_impl(pysqlite_Cursor *self, TyObject *size, TyObject *column) /*[clinic end generated code: output=018d7e9129d45efe input=607a6bece8bbb273]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1298,7 +1298,7 @@ pysqlite_cursor_close_impl(pysqlite_Cursor *self) self->closed = 1; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef cursor_methods[] = { @@ -1316,13 +1316,13 @@ static TyMethodDef cursor_methods[] = { static struct TyMemberDef cursor_members[] = { - {"connection", _Ty_T_OBJECT, offsetof(pysqlite_Cursor, connection), Ty_READONLY}, - {"description", _Ty_T_OBJECT, offsetof(pysqlite_Cursor, description), Ty_READONLY}, + {"connection", _Ty_T_OBJECT, offsetof(pysqlite_Cursor, connection), Py_READONLY}, + {"description", _Ty_T_OBJECT, offsetof(pysqlite_Cursor, description), Py_READONLY}, {"arraysize", Ty_T_INT, offsetof(pysqlite_Cursor, arraysize), 0}, - {"lastrowid", _Ty_T_OBJECT, offsetof(pysqlite_Cursor, lastrowid), Ty_READONLY}, - {"rowcount", Ty_T_LONG, offsetof(pysqlite_Cursor, rowcount), Ty_READONLY}, + {"lastrowid", _Ty_T_OBJECT, offsetof(pysqlite_Cursor, lastrowid), Py_READONLY}, + {"rowcount", Ty_T_LONG, offsetof(pysqlite_Cursor, rowcount), Py_READONLY}, {"row_factory", _Ty_T_OBJECT, offsetof(pysqlite_Cursor, row_factory), 0}, - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(pysqlite_Cursor, in_weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(pysqlite_Cursor, in_weakreflist), Py_READONLY}, {NULL} }; diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c index d8a02fa..aecb8eb 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -140,7 +140,7 @@ pysqlite_register_adapter_impl(TyObject *module, TyTypeObject *type, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -194,7 +194,7 @@ pysqlite_enable_callback_trace_impl(TyObject *module, int enable) pysqlite_state *state = pysqlite_get_state(module); state->enable_callback_tracebacks = enable; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c index 1dfff0c..d31af8d 100644 --- a/Modules/_sqlite/row.c +++ b/Modules/_sqlite/row.c @@ -109,7 +109,7 @@ pysqlite_row_item(TyObject *op, Ty_ssize_t idx) static int equal_ignore_case(TyObject *left, TyObject *right) { - int eq = PyObject_RichCompareBool(left, right, Ty_EQ); + int eq = PyObject_RichCompareBool(left, right, Py_EQ); if (eq) { /* equal or error */ return eq; } @@ -238,23 +238,23 @@ pysqlite_row_hash(TyObject *op) static TyObject * pysqlite_row_richcompare(TyObject *op, TyObject *opother, int opid) { - if (opid != Ty_EQ && opid != Ty_NE) - Ty_RETURN_NOTIMPLEMENTED; + if (opid != Py_EQ && opid != Py_NE) + Py_RETURN_NOTIMPLEMENTED; pysqlite_Row *self = _pysqlite_Row_CAST(op); pysqlite_state *state = pysqlite_get_state_by_type(Ty_TYPE(self)); if (PyObject_TypeCheck(opother, state->RowType)) { pysqlite_Row *other = (pysqlite_Row *)opother; - int eq = PyObject_RichCompareBool(self->description, other->description, Ty_EQ); + int eq = PyObject_RichCompareBool(self->description, other->description, Py_EQ); if (eq < 0) { return NULL; } if (eq) { return PyObject_RichCompare(self->data, other->data, opid); } - return TyBool_FromLong(opid != Ty_EQ); + return TyBool_FromLong(opid != Py_EQ); } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } static TyMethodDef row_methods[] = { diff --git a/Modules/_sre/clinic/sre.c.h b/Modules/_sre/clinic/sre.c.h index edfc77c..fff5d14 100644 --- a/Modules/_sre/clinic/sre.c.h +++ b/Modules/_sre/clinic/sre.c.h @@ -21,7 +21,7 @@ static int _sre_getcodesize_impl(TyObject *module); static TyObject * -_sre_getcodesize(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_sre_getcodesize(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -990,7 +990,7 @@ static TyObject * _sre_SRE_Pattern___copy___impl(PatternObject *self); static TyObject * -_sre_SRE_Pattern___copy__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_sre_SRE_Pattern___copy__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _sre_SRE_Pattern___copy___impl((PatternObject *)self); } @@ -1497,7 +1497,7 @@ static TyObject * _sre_SRE_Match___copy___impl(MatchObject *self); static TyObject * -_sre_SRE_Match___copy__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_sre_SRE_Match___copy__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _sre_SRE_Match___copy___impl((MatchObject *)self); } diff --git a/Modules/_sre/sre.c b/Modules/_sre/sre.c index 9100564..e505de6 100644 --- a/Modules/_sre/sre.c +++ b/Modules/_sre/sre.c @@ -661,7 +661,7 @@ state_getslice(SRE_STATE* state, Ty_ssize_t index, TyObject* string, int empty) /* want empty string */ i = j = 0; else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } else { i = STATE_OFFSET(state, state->mark[index]); @@ -1506,7 +1506,7 @@ _sre_SRE_Pattern__fail_after_impl(PatternObject *self, int count, self->fail_after_count = count; Ty_INCREF(exception); Ty_XSETREF(self->fail_after_exc, exception); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* Ty_DEBUG */ @@ -1595,7 +1595,7 @@ PyDoc_STRVAR(pattern_doc, "Compiled regular expression object."); /* PatternObject's 'groupindex' method. */ static TyObject * -pattern_groupindex(TyObject *op, void *Ty_UNUSED(ignored)) +pattern_groupindex(TyObject *op, void *Py_UNUSED(ignored)) { PatternObject *self = _PatternObject_CAST(op); if (self->groupindex == NULL) @@ -2674,16 +2674,16 @@ PyDoc_STRVAR(match_group_doc, For 0 returns the entire match."); static TyObject * -match_lastindex_get(TyObject *op, void *Ty_UNUSED(ignored)) +match_lastindex_get(TyObject *op, void *Py_UNUSED(ignored)) { MatchObject *self = _MatchObject_CAST(op); if (self->lastindex >= 0) return TyLong_FromSsize_t(self->lastindex); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -match_lastgroup_get(TyObject *op, void *Ty_UNUSED(ignored)) +match_lastgroup_get(TyObject *op, void *Py_UNUSED(ignored)) { MatchObject *self = _MatchObject_CAST(op); if (self->pattern->indexgroup && @@ -2694,11 +2694,11 @@ match_lastgroup_get(TyObject *op, void *Ty_UNUSED(ignored)) self->lastindex); return Ty_NewRef(result); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -match_regs_get(TyObject *op, void *Ty_UNUSED(ignored)) +match_regs_get(TyObject *op, void *Py_UNUSED(ignored)) { MatchObject *self = _MatchObject_CAST(op); if (self->regs) { @@ -2790,7 +2790,7 @@ pattern_new_match(_sremodulestate* module_state, } else if (status == 0) { /* no match */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2873,7 +2873,7 @@ _sre_SRE_Scanner_match_impl(ScannerObject *self, TyTypeObject *cls) } if (state->start == NULL) { scanner_end(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } state_reset(state); @@ -2923,7 +2923,7 @@ _sre_SRE_Scanner_search_impl(ScannerObject *self, TyTypeObject *cls) } if (state->start == NULL) { scanner_end(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } state_reset(state); @@ -3115,18 +3115,18 @@ pattern_richcompare(TyObject *lefto, TyObject *righto, int op) PatternObject *left, *right; int cmp; - if (op != Ty_EQ && op != Ty_NE) { - Ty_RETURN_NOTIMPLEMENTED; + if (op != Py_EQ && op != Py_NE) { + Py_RETURN_NOTIMPLEMENTED; } if (!Ty_IS_TYPE(righto, module_state->Pattern_Type)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } if (lefto == righto) { /* a pattern is equal to itself */ - return TyBool_FromLong(op == Ty_EQ); + return TyBool_FromLong(op == Py_EQ); } left = (PatternObject *)lefto; @@ -3145,12 +3145,12 @@ pattern_richcompare(TyObject *lefto, TyObject *righto, int op) } if (cmp) { cmp = PyObject_RichCompareBool(left->pattern, right->pattern, - Ty_EQ); + Py_EQ); if (cmp < 0) { return NULL; } } - if (op == Ty_NE) { + if (op == Py_NE) { cmp = !cmp; } return TyBool_FromLong(cmp); @@ -3184,13 +3184,13 @@ static TyGetSetDef pattern_getset[] = { #define PAT_OFF(x) offsetof(PatternObject, x) static TyMemberDef pattern_members[] = { - {"pattern", _Ty_T_OBJECT, PAT_OFF(pattern), Ty_READONLY, + {"pattern", _Ty_T_OBJECT, PAT_OFF(pattern), Py_READONLY, "The pattern string from which the RE object was compiled."}, - {"flags", Ty_T_INT, PAT_OFF(flags), Ty_READONLY, + {"flags", Ty_T_INT, PAT_OFF(flags), Py_READONLY, "The regex matching flags."}, - {"groups", Ty_T_PYSSIZET, PAT_OFF(groups), Ty_READONLY, + {"groups", Ty_T_PYSSIZET, PAT_OFF(groups), Py_READONLY, "The number of capturing groups in the pattern."}, - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(PatternObject, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(PatternObject, weakreflist), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -3243,13 +3243,13 @@ static TyGetSetDef match_getset[] = { #define MATCH_OFF(x) offsetof(MatchObject, x) static TyMemberDef match_members[] = { - {"string", _Ty_T_OBJECT, MATCH_OFF(string), Ty_READONLY, + {"string", _Ty_T_OBJECT, MATCH_OFF(string), Py_READONLY, "The string passed to match() or search()."}, - {"re", _Ty_T_OBJECT, MATCH_OFF(pattern), Ty_READONLY, + {"re", _Ty_T_OBJECT, MATCH_OFF(pattern), Py_READONLY, "The regular expression object."}, - {"pos", Ty_T_PYSSIZET, MATCH_OFF(pos), Ty_READONLY, + {"pos", Ty_T_PYSSIZET, MATCH_OFF(pos), Py_READONLY, "The index into the string at which the RE engine started looking for a match."}, - {"endpos", Ty_T_PYSSIZET, MATCH_OFF(endpos), Ty_READONLY, + {"endpos", Ty_T_PYSSIZET, MATCH_OFF(endpos), Py_READONLY, "The index into the string beyond which the RE engine will not go."}, {NULL} }; @@ -3293,7 +3293,7 @@ static TyMethodDef scanner_methods[] = { #define SCAN_OFF(x) offsetof(ScannerObject, x) static TyMemberDef scanner_members[] = { - {"pattern", _Ty_T_OBJECT, SCAN_OFF(pattern), Ty_READONLY}, + {"pattern", _Ty_T_OBJECT, SCAN_OFF(pattern), Py_READONLY}, {NULL} /* Sentinel */ }; diff --git a/Modules/_ssl/cert.c b/Modules/_ssl/cert.c index f842aaf..c7af281 100644 --- a/Modules/_ssl/cert.c +++ b/Modules/_ssl/cert.c @@ -202,17 +202,17 @@ certificate_richcompare(TyObject *lhs, TyObject *rhs, int op) _sslmodulestate *state = get_state_cert(self); if (Ty_TYPE(rhs) != state->PySSLCertificate_Type) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } /* only support == and != */ - if ((op != Ty_EQ) && (op != Ty_NE)) { - Ty_RETURN_NOTIMPLEMENTED; + if ((op != Py_EQ) && (op != Py_NE)) { + Py_RETURN_NOTIMPLEMENTED; } cmp = X509_cmp(self->cert, ((PySSLCertificate*)rhs)->cert); - if (((op == Ty_EQ) && (cmp == 0)) || ((op == Ty_NE) && (cmp != 0))) { - Ty_RETURN_TRUE; + if (((op == Py_EQ) && (cmp == 0)) || ((op == Py_NE) && (cmp != 0))) { + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } diff --git a/Modules/_ssl/clinic/cert.c.h b/Modules/_ssl/clinic/cert.c.h index 34d18ed..f31aa38 100644 --- a/Modules/_ssl/clinic/cert.c.h +++ b/Modules/_ssl/clinic/cert.c.h @@ -85,7 +85,7 @@ static TyObject * _ssl_Certificate_get_info_impl(PySSLCertificate *self); static TyObject * -_ssl_Certificate_get_info(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl_Certificate_get_info(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _ssl_Certificate_get_info_impl((PySSLCertificate *)self); } diff --git a/Modules/_ssl/debughelpers.c b/Modules/_ssl/debughelpers.c index 9b92eb2..05be203 100644 --- a/Modules/_ssl/debughelpers.c +++ b/Modules/_ssl/debughelpers.c @@ -85,19 +85,19 @@ _PySSL_msg_callback(int write_p, int version, int content_type, static TyObject * -_PySSLContext_get_msg_callback(TyObject *op, void *Ty_UNUSED(closure)) +_PySSLContext_get_msg_callback(TyObject *op, void *Py_UNUSED(closure)) { PySSLContext *self = PySSLContext_CAST(op); if (self->msg_cb != NULL) { return Ty_NewRef(self->msg_cb); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } static int _PySSLContext_set_msg_callback(TyObject *op, TyObject *arg, - void *Ty_UNUSED(closure)) + void *Py_UNUSED(closure)) { PySSLContext *self = PySSLContext_CAST(op); Ty_CLEAR(self->msg_cb); @@ -158,19 +158,19 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line) } static TyObject * -_PySSLContext_get_keylog_filename(TyObject *op, void *Ty_UNUSED(closure)) +_PySSLContext_get_keylog_filename(TyObject *op, void *Py_UNUSED(closure)) { PySSLContext *self = PySSLContext_CAST(op); if (self->keylog_filename != NULL) { return Ty_NewRef(self->keylog_filename); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } static int _PySSLContext_set_keylog_filename(TyObject *op, TyObject *arg, - void *Ty_UNUSED(closure)) + void *Py_UNUSED(closure)) { PySSLContext *self = PySSLContext_CAST(op); FILE *fp; diff --git a/Modules/_struct.c b/Modules/_struct.c index 24ad54d..870a272 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1973,7 +1973,7 @@ unpackiter_traverse(TyObject *op, visitproc visit, void *arg) } static TyObject * -unpackiter_len(TyObject *op, TyObject *Ty_UNUSED(dummy)) +unpackiter_len(TyObject *op, TyObject *Py_UNUSED(dummy)) { Ty_ssize_t len; unpackiterobject *self = unpackiterobject_CAST(op); @@ -2321,11 +2321,11 @@ s_pack_into(TyObject *self, TyObject *const *args, Ty_ssize_t nargs) } PyBuffer_Release(&buffer); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -s_get_format(TyObject *op, void *Ty_UNUSED(closure)) +s_get_format(TyObject *op, void *Py_UNUSED(closure)) { PyStructObject *self = PyStructObject_CAST(op); return TyUnicode_FromStringAndSize(TyBytes_AS_STRING(self->s_format), @@ -2333,7 +2333,7 @@ s_get_format(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -s_get_size(TyObject *op, void *Ty_UNUSED(closure)) +s_get_size(TyObject *op, void *Py_UNUSED(closure)) { PyStructObject *self = PyStructObject_CAST(op); return TyLong_FromSsize_t(self->s_size); @@ -2343,7 +2343,7 @@ PyDoc_STRVAR(s_sizeof__doc__, "S.__sizeof__() -> size of S in memory, in bytes"); static TyObject * -s_sizeof(TyObject *op, TyObject *Ty_UNUSED(dummy)) +s_sizeof(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyStructObject *self = PyStructObject_CAST(op); size_t size = _TyObject_SIZE(Ty_TYPE(self)) + sizeof(formatcode); @@ -2380,7 +2380,7 @@ static struct TyMethodDef s_methods[] = { }; static TyMemberDef s_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(PyStructObject, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(PyStructObject, weakreflist), Py_READONLY}, {NULL} /* sentinel */ }; @@ -2470,7 +2470,7 @@ _clearcache_impl(TyObject *module) /*[clinic end generated code: output=ce4fb8a7bf7cb523 input=463eaae04bab3211]*/ { TyDict_Clear(get_struct_state(module)->cache); - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_suggestions.c b/Modules/_suggestions.c index 87fc1c5..f7b0c71 100644 --- a/Modules/_suggestions.c +++ b/Modules/_suggestions.c @@ -38,7 +38,7 @@ _suggestions__generate_suggestions_impl(TyObject *module, TyObject* result = _Ty_CalculateSuggestions(candidates, item); if (!result && !TyErr_Occurred()) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return result; } diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c index 39c3427..87a9741 100644 --- a/Modules/_testbuffer.c +++ b/Modules/_testbuffer.c @@ -1380,7 +1380,7 @@ ndarray_push(TyObject *self, TyObject *args, TyObject *kwds) if (ndarray_push_base(nd, items, shape, strides, offset, format, flags) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Pop a base from the linked list (if possible). */ @@ -1406,7 +1406,7 @@ ndarray_pop(TyObject *self, TyObject *dummy) } ndbuf_pop(nd); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /**************************************************************************/ @@ -2025,7 +2025,7 @@ ndarray_get_obj(TyObject *op, void *closure) Ty_buffer *base = &self->head->base; if (base->obj == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(base->obj); } @@ -2234,7 +2234,7 @@ ndarray_add_suboffsets(TyObject *self, TyObject *dummy) nd->head->flags &= ~(ND_C|ND_FORTRAN); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Test TyMemoryView_FromBuffer(): return a memoryview from a static buffer. @@ -2365,7 +2365,7 @@ out: } static TyObject * -get_sizeof_void_p(TyObject *self, TyObject *Ty_UNUSED(ignored)) +get_sizeof_void_p(TyObject *self, TyObject *Py_UNUSED(ignored)) { return TyLong_FromSize_t(sizeof(void *)); } diff --git a/Modules/_testcapi/abstract.c b/Modules/_testcapi/abstract.c index fca759c..4fb33ac 100644 --- a/Modules/_testcapi/abstract.c +++ b/Modules/_testcapi/abstract.c @@ -134,7 +134,7 @@ pyiter_next(TyObject *self, TyObject *iter) { TyObject *item = TyIter_Next(iter); if (item == NULL && !TyErr_Occurred()) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return item; } @@ -151,7 +151,7 @@ pyiter_nextitem(TyObject *self, TyObject *iter) } assert(!TyErr_Occurred()); if (item == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return item; } diff --git a/Modules/_testcapi/buffer.c b/Modules/_testcapi/buffer.c index 0770340..1af113c 100644 --- a/Modules/_testcapi/buffer.c +++ b/Modules/_testcapi/buffer.c @@ -68,7 +68,7 @@ testbuf_getbuf(TyObject *op, Ty_buffer *view, int flags) } static void -testbuf_releasebuf(TyObject *op, Ty_buffer *Ty_UNUSED(view)) +testbuf_releasebuf(TyObject *op, Ty_buffer *Py_UNUSED(view)) { testBufObject *self = testBufObject_CAST(op); self->references--; @@ -81,7 +81,7 @@ static PyBufferProcs testbuf_as_buffer = { }; static struct TyMemberDef testbuf_members[] = { - {"references", Ty_T_PYSSIZET, offsetof(testBufObject, references), Ty_READONLY}, + {"references", Ty_T_PYSSIZET, offsetof(testBufObject, references), Py_READONLY}, {NULL}, }; diff --git a/Modules/_testcapi/clinic/exceptions.c.h b/Modules/_testcapi/clinic/exceptions.c.h index 18c34e3..c66d297 100644 --- a/Modules/_testcapi/clinic/exceptions.c.h +++ b/Modules/_testcapi/clinic/exceptions.c.h @@ -324,7 +324,7 @@ static TyObject * _testcapi_raise_memoryerror_impl(TyObject *module); static TyObject * -_testcapi_raise_memoryerror(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testcapi_raise_memoryerror(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testcapi_raise_memoryerror_impl(module); } diff --git a/Modules/_testcapi/code.c b/Modules/_testcapi/code.c index 69bf86f..3ea5982 100644 --- a/Modules/_testcapi/code.c +++ b/Modules/_testcapi/code.c @@ -44,7 +44,7 @@ finally: } static TyObject * -test_code_extra(TyObject* self, TyObject *Ty_UNUSED(callable)) +test_code_extra(TyObject* self, TyObject *Py_UNUSED(callable)) { TyObject *result = NULL; TyObject *test_func = NULL; diff --git a/Modules/_testcapi/codec.c b/Modules/_testcapi/codec.c index ca608c9..f20d42d 100644 --- a/Modules/_testcapi/codec.c +++ b/Modules/_testcapi/codec.c @@ -4,25 +4,25 @@ // === Codecs registration and un-registration ================================ static TyObject * -codec_register(TyObject *Ty_UNUSED(module), TyObject *search_function) +codec_register(TyObject *Py_UNUSED(module), TyObject *search_function) { if (PyCodec_Register(search_function) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -codec_unregister(TyObject *Ty_UNUSED(module), TyObject *search_function) +codec_unregister(TyObject *Py_UNUSED(module), TyObject *search_function) { if (PyCodec_Unregister(search_function) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -codec_known_encoding(TyObject *Ty_UNUSED(module), TyObject *args) +codec_known_encoding(TyObject *Py_UNUSED(module), TyObject *args) { const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested if (!TyArg_ParseTuple(args, "z", &encoding)) { @@ -34,7 +34,7 @@ codec_known_encoding(TyObject *Ty_UNUSED(module), TyObject *args) // === Codecs encoding and decoding interfaces ================================ static TyObject * -codec_encode(TyObject *Ty_UNUSED(module), TyObject *args) +codec_encode(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *input; const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested @@ -46,7 +46,7 @@ codec_encode(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -codec_decode(TyObject *Ty_UNUSED(module), TyObject *args) +codec_decode(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *input; const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested @@ -58,7 +58,7 @@ codec_decode(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -codec_encoder(TyObject *Ty_UNUSED(module), TyObject *args) +codec_encoder(TyObject *Py_UNUSED(module), TyObject *args) { const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested if (!TyArg_ParseTuple(args, "z", &encoding)) { @@ -68,7 +68,7 @@ codec_encoder(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -codec_decoder(TyObject *Ty_UNUSED(module), TyObject *args) +codec_decoder(TyObject *Py_UNUSED(module), TyObject *args) { const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested if (!TyArg_ParseTuple(args, "z", &encoding)) { @@ -78,7 +78,7 @@ codec_decoder(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -codec_incremental_encoder(TyObject *Ty_UNUSED(module), TyObject *args) +codec_incremental_encoder(TyObject *Py_UNUSED(module), TyObject *args) { const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested const char *errors; // can be NULL @@ -89,7 +89,7 @@ codec_incremental_encoder(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -codec_incremental_decoder(TyObject *Ty_UNUSED(module), TyObject *args) +codec_incremental_decoder(TyObject *Py_UNUSED(module), TyObject *args) { const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested const char *errors; // can be NULL @@ -100,7 +100,7 @@ codec_incremental_decoder(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -codec_stream_reader(TyObject *Ty_UNUSED(module), TyObject *args) +codec_stream_reader(TyObject *Py_UNUSED(module), TyObject *args) { const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested TyObject *stream; @@ -112,7 +112,7 @@ codec_stream_reader(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -codec_stream_writer(TyObject *Ty_UNUSED(module), TyObject *args) +codec_stream_writer(TyObject *Py_UNUSED(module), TyObject *args) { const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested TyObject *stream; @@ -126,7 +126,7 @@ codec_stream_writer(TyObject *Ty_UNUSED(module), TyObject *args) // === Codecs errors handlers ================================================= static TyObject * -codec_register_error(TyObject *Ty_UNUSED(module), TyObject *args) +codec_register_error(TyObject *Py_UNUSED(module), TyObject *args) { const char *encoding; // must not be NULL TyObject *error; @@ -136,11 +136,11 @@ codec_register_error(TyObject *Ty_UNUSED(module), TyObject *args) if (PyCodec_RegisterError(encoding, error) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -codec_lookup_error(TyObject *Ty_UNUSED(module), TyObject *args) +codec_lookup_error(TyObject *Py_UNUSED(module), TyObject *args) { const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested if (!TyArg_ParseTuple(args, "z", &encoding)) { @@ -150,35 +150,35 @@ codec_lookup_error(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -codec_strict_errors(TyObject *Ty_UNUSED(module), TyObject *exc) +codec_strict_errors(TyObject *Py_UNUSED(module), TyObject *exc) { assert(exc != NULL); return PyCodec_StrictErrors(exc); } static TyObject * -codec_ignore_errors(TyObject *Ty_UNUSED(module), TyObject *exc) +codec_ignore_errors(TyObject *Py_UNUSED(module), TyObject *exc) { assert(exc != NULL); return PyCodec_IgnoreErrors(exc); } static TyObject * -codec_replace_errors(TyObject *Ty_UNUSED(module), TyObject *exc) +codec_replace_errors(TyObject *Py_UNUSED(module), TyObject *exc) { assert(exc != NULL); return PyCodec_ReplaceErrors(exc); } static TyObject * -codec_xmlcharrefreplace_errors(TyObject *Ty_UNUSED(module), TyObject *exc) +codec_xmlcharrefreplace_errors(TyObject *Py_UNUSED(module), TyObject *exc) { assert(exc != NULL); return PyCodec_XMLCharRefReplaceErrors(exc); } static TyObject * -codec_backslashreplace_errors(TyObject *Ty_UNUSED(module), TyObject *exc) +codec_backslashreplace_errors(TyObject *Py_UNUSED(module), TyObject *exc) { assert(exc != NULL); return PyCodec_BackslashReplaceErrors(exc); diff --git a/Modules/_testcapi/complex.c b/Modules/_testcapi/complex.c index 91ba439..457fa10 100644 --- a/Modules/_testcapi/complex.c +++ b/Modules/_testcapi/complex.c @@ -3,7 +3,7 @@ static TyObject * -complex_fromccomplex(TyObject *Ty_UNUSED(module), TyObject *obj) +complex_fromccomplex(TyObject *Py_UNUSED(module), TyObject *obj) { Ty_complex complex; @@ -15,7 +15,7 @@ complex_fromccomplex(TyObject *Ty_UNUSED(module), TyObject *obj) } static TyObject * -complex_asccomplex(TyObject *Ty_UNUSED(module), TyObject *obj) +complex_asccomplex(TyObject *Py_UNUSED(module), TyObject *obj) { Ty_complex complex; @@ -30,7 +30,7 @@ complex_asccomplex(TyObject *Ty_UNUSED(module), TyObject *obj) } static TyObject* -_py_c_neg(TyObject *Ty_UNUSED(module), TyObject *num) +_py_c_neg(TyObject *Py_UNUSED(module), TyObject *num) { Ty_complex complex; @@ -44,7 +44,7 @@ _py_c_neg(TyObject *Ty_UNUSED(module), TyObject *num) #define _PY_C_FUNC2(suffix) \ static TyObject * \ - _py_c_##suffix(TyObject *Ty_UNUSED(module), TyObject *args) \ + _py_c_##suffix(TyObject *Py_UNUSED(module), TyObject *args) \ { \ Ty_complex a, b, res; \ \ @@ -64,7 +64,7 @@ _PY_C_FUNC2(quot) _PY_C_FUNC2(pow) static TyObject* -_py_c_abs(TyObject *Ty_UNUSED(module), TyObject* obj) +_py_c_abs(TyObject *Py_UNUSED(module), TyObject* obj) { Ty_complex complex; double res; diff --git a/Modules/_testcapi/config.c b/Modules/_testcapi/config.c index 396e985..899ca82 100644 --- a/Modules/_testcapi/config.c +++ b/Modules/_testcapi/config.c @@ -30,7 +30,7 @@ _testcapi_config_getint(TyObject *module, TyObject *name_obj) static TyObject * -_testcapi_config_names(TyObject *module, TyObject* Ty_UNUSED(args)) +_testcapi_config_names(TyObject *module, TyObject* Py_UNUSED(args)) { return TyConfig_Names(); } @@ -49,7 +49,7 @@ _testcapi_config_set(TyObject *module, TyObject *args) if (res < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testcapi/datetime.c b/Modules/_testcapi/datetime.c index aaabd9a..6018641 100644 --- a/Modules/_testcapi/datetime.c +++ b/Modules/_testcapi/datetime.c @@ -11,7 +11,7 @@ test_datetime_capi(TyObject *self, TyObject *args) if (PyDateTimeAPI) { if (test_run_counter) { /* Probably regrtest.py -R */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } else { TyErr_SetString(TyExc_AssertionError, @@ -32,7 +32,7 @@ test_datetime_capi(TyObject *self, TyObject *args) assert(!TyType_HasFeature(PyDateTimeAPI->DateTimeType, Ty_TPFLAGS_HEAPTYPE)); assert(!TyType_HasFeature(PyDateTimeAPI->DeltaType, Ty_TPFLAGS_HEAPTYPE)); assert(!TyType_HasFeature(PyDateTimeAPI->TZInfoType, Ty_TPFLAGS_HEAPTYPE)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Functions exposing the C API type checking for testing */ @@ -45,9 +45,9 @@ do { \ } \ int rv = exact?exact_method(obj):check_method(obj); \ if (rv) { \ - Ty_RETURN_TRUE; \ + Py_RETURN_TRUE; \ } \ - Ty_RETURN_FALSE; \ + Py_RETURN_FALSE; \ } while (0) \ static TyObject * diff --git a/Modules/_testcapi/dict.c b/Modules/_testcapi/dict.c index 30df141..48000e4 100644 --- a/Modules/_testcapi/dict.c +++ b/Modules/_testcapi/dict.c @@ -244,7 +244,7 @@ error: static TyObject* -test_dict_iteration(TyObject* self, TyObject *Ty_UNUSED(ignored)) +test_dict_iteration(TyObject* self, TyObject *Py_UNUSED(ignored)) { int i; @@ -254,7 +254,7 @@ test_dict_iteration(TyObject* self, TyObject *Ty_UNUSED(ignored)) } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testcapi/docstring.c b/Modules/_testcapi/docstring.c index 1a385b2..af51248 100644 --- a/Modules/_testcapi/docstring.c +++ b/Modules/_testcapi/docstring.c @@ -59,9 +59,9 @@ PyDoc_STRVAR(docstring_with_signature_with_defaults, /* This is here to provide a docstring for test_descr. */ static TyObject * -test_with_docstring(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_with_docstring(TyObject *self, TyObject *Py_UNUSED(ignored)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef test_methods[] = { diff --git a/Modules/_testcapi/exceptions.c b/Modules/_testcapi/exceptions.c index ae80ad6..7a6efa1 100644 --- a/Modules/_testcapi/exceptions.c +++ b/Modules/_testcapi/exceptions.c @@ -78,7 +78,7 @@ _testcapi_exception_print_impl(TyObject *module, TyObject *exc, int legacy) else { TyErr_DisplayException(exc); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -235,7 +235,7 @@ _testcapi_fatal_error_impl(TyObject *module, const char *message, Ty_FatalError(message); } // Ty_FatalError() does not return, but exits the process. - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -301,11 +301,11 @@ _testcapi_traceback_print_impl(TyObject *module, TyObject *traceback, if (PyTraceBack_Print(traceback, file) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -err_writeunraisable(TyObject *Ty_UNUSED(module), TyObject *args) +err_writeunraisable(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *exc, *obj; if (!TyArg_ParseTuple(args, "OO", &exc, &obj)) { @@ -317,11 +317,11 @@ err_writeunraisable(TyObject *Ty_UNUSED(module), TyObject *args) TyErr_SetRaisedException(Ty_NewRef(exc)); } TyErr_WriteUnraisable(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -err_formatunraisable(TyObject *Ty_UNUSED(module), TyObject *args) +err_formatunraisable(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *exc; const char *fmt; @@ -341,7 +341,7 @@ err_formatunraisable(TyObject *Ty_UNUSED(module), TyObject *args) TyErr_FormatUnraisable(fmt, objs[0], objs[1], objs[2], objs[3], objs[4], objs[5], objs[6], objs[7], objs[8], objs[9]); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -362,7 +362,7 @@ _testcapi_unstable_exc_prep_reraise_star_impl(TyObject *module, /* Test PyUnicodeEncodeError_GetStart */ static TyObject * -unicode_encode_get_start(TyObject *Ty_UNUSED(module), TyObject *arg) +unicode_encode_get_start(TyObject *Py_UNUSED(module), TyObject *arg) { Ty_ssize_t start; if (PyUnicodeEncodeError_GetStart(arg, &start) < 0) { @@ -373,7 +373,7 @@ unicode_encode_get_start(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test PyUnicodeDecodeError_GetStart */ static TyObject * -unicode_decode_get_start(TyObject *Ty_UNUSED(module), TyObject *arg) +unicode_decode_get_start(TyObject *Py_UNUSED(module), TyObject *arg) { Ty_ssize_t start; if (PyUnicodeDecodeError_GetStart(arg, &start) < 0) { @@ -384,7 +384,7 @@ unicode_decode_get_start(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test PyUnicodeTranslateError_GetStart */ static TyObject * -unicode_translate_get_start(TyObject *Ty_UNUSED(module), TyObject *arg) +unicode_translate_get_start(TyObject *Py_UNUSED(module), TyObject *arg) { Ty_ssize_t start; if (PyUnicodeTranslateError_GetStart(arg, &start) < 0) { @@ -395,7 +395,7 @@ unicode_translate_get_start(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test PyUnicodeEncodeError_SetStart */ static TyObject * -unicode_encode_set_start(TyObject *Ty_UNUSED(module), TyObject *args) +unicode_encode_set_start(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *exc; Ty_ssize_t start; @@ -405,12 +405,12 @@ unicode_encode_set_start(TyObject *Ty_UNUSED(module), TyObject *args) if (PyUnicodeEncodeError_SetStart(exc, start) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Test PyUnicodeDecodeError_SetStart */ static TyObject * -unicode_decode_set_start(TyObject *Ty_UNUSED(module), TyObject *args) +unicode_decode_set_start(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *exc; Ty_ssize_t start; @@ -420,12 +420,12 @@ unicode_decode_set_start(TyObject *Ty_UNUSED(module), TyObject *args) if (PyUnicodeDecodeError_SetStart(exc, start) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Test PyUnicodeTranslateError_SetStart */ static TyObject * -unicode_translate_set_start(TyObject *Ty_UNUSED(module), TyObject *args) +unicode_translate_set_start(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *exc; Ty_ssize_t start; @@ -435,12 +435,12 @@ unicode_translate_set_start(TyObject *Ty_UNUSED(module), TyObject *args) if (PyUnicodeTranslateError_SetStart(exc, start) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Test PyUnicodeEncodeError_GetEnd */ static TyObject * -unicode_encode_get_end(TyObject *Ty_UNUSED(module), TyObject *arg) +unicode_encode_get_end(TyObject *Py_UNUSED(module), TyObject *arg) { Ty_ssize_t end; if (PyUnicodeEncodeError_GetEnd(arg, &end) < 0) { @@ -451,7 +451,7 @@ unicode_encode_get_end(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test PyUnicodeDecodeError_GetEnd */ static TyObject * -unicode_decode_get_end(TyObject *Ty_UNUSED(module), TyObject *arg) +unicode_decode_get_end(TyObject *Py_UNUSED(module), TyObject *arg) { Ty_ssize_t end; if (PyUnicodeDecodeError_GetEnd(arg, &end) < 0) { @@ -462,7 +462,7 @@ unicode_decode_get_end(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test PyUnicodeTranslateError_GetEnd */ static TyObject * -unicode_translate_get_end(TyObject *Ty_UNUSED(module), TyObject *arg) +unicode_translate_get_end(TyObject *Py_UNUSED(module), TyObject *arg) { Ty_ssize_t end; if (PyUnicodeTranslateError_GetEnd(arg, &end) < 0) { @@ -473,7 +473,7 @@ unicode_translate_get_end(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test PyUnicodeEncodeError_SetEnd */ static TyObject * -unicode_encode_set_end(TyObject *Ty_UNUSED(module), TyObject *args) +unicode_encode_set_end(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *exc; Ty_ssize_t end; @@ -483,12 +483,12 @@ unicode_encode_set_end(TyObject *Ty_UNUSED(module), TyObject *args) if (PyUnicodeEncodeError_SetEnd(exc, end) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Test PyUnicodeDecodeError_SetEnd */ static TyObject * -unicode_decode_set_end(TyObject *Ty_UNUSED(module), TyObject *args) +unicode_decode_set_end(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *exc; Ty_ssize_t end; @@ -498,12 +498,12 @@ unicode_decode_set_end(TyObject *Ty_UNUSED(module), TyObject *args) if (PyUnicodeDecodeError_SetEnd(exc, end) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Test PyUnicodeTranslateError_SetEnd */ static TyObject * -unicode_translate_set_end(TyObject *Ty_UNUSED(module), TyObject *args) +unicode_translate_set_end(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *exc; Ty_ssize_t end; @@ -513,7 +513,7 @@ unicode_translate_set_end(TyObject *Ty_UNUSED(module), TyObject *args) if (PyUnicodeTranslateError_SetEnd(exc, end) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* diff --git a/Modules/_testcapi/file.c b/Modules/_testcapi/file.c index 1e66230..b8e9641 100644 --- a/Modules/_testcapi/file.c +++ b/Modules/_testcapi/file.c @@ -87,7 +87,7 @@ _testcapi_py_universalnewlinefgets_impl(TyObject *module, TyObject *file, if (result == NULL) { TyMem_Free(buf); Ty_fclose(fp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *line = TyBytes_FromString(result); diff --git a/Modules/_testcapi/float.c b/Modules/_testcapi/float.c index c41bd9f..85c5ffd 100644 --- a/Modules/_testcapi/float.c +++ b/Modules/_testcapi/float.c @@ -102,7 +102,7 @@ _testcapi_float_unpack_impl(TyObject *module, const char *data, /* Test TyOS_string_to_double. */ static TyObject * -test_string_to_double(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_string_to_double(TyObject *self, TyObject *Py_UNUSED(ignored)) { double result; const char *msg; @@ -148,7 +148,7 @@ test_string_to_double(TyObject *self, TyObject *Ty_UNUSED(ignored)) CHECK_INVALID("3\n"); CHECK_INVALID("123abc"); - Ty_RETURN_NONE; + Py_RETURN_NONE; fail: TyErr_Format(TyExc_AssertionError, "test_string_to_double: %s", msg); return NULL; diff --git a/Modules/_testcapi/frame.c b/Modules/_testcapi/frame.c index cc23e97..b9a8720 100644 --- a/Modules/_testcapi/frame.c +++ b/Modules/_testcapi/frame.c @@ -58,7 +58,7 @@ frame_getlasti(TyObject *self, TyObject *frame) int lasti = TyFrame_GetLasti((PyFrameObject *)frame); if (lasti < 0) { assert(lasti == -1); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyLong_FromLong(lasti); } diff --git a/Modules/_testcapi/function.c b/Modules/_testcapi/function.c index b99c66d..78f768e 100644 --- a/Modules/_testcapi/function.c +++ b/Modules/_testcapi/function.c @@ -47,7 +47,7 @@ function_get_defaults(TyObject *self, TyObject *func) } else if (TyErr_Occurred()) { return NULL; } else { - Ty_RETURN_NONE; // This can happen when `defaults` are set to `None` + Py_RETURN_NONE; // This can happen when `defaults` are set to `None` } } @@ -62,7 +62,7 @@ function_set_defaults(TyObject *self, TyObject *args) int result = TyFunction_SetDefaults(func, defaults); if (result == -1) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -75,7 +75,7 @@ function_get_kw_defaults(TyObject *self, TyObject *func) } else if (TyErr_Occurred()) { return NULL; } else { - Ty_RETURN_NONE; // This can happen when `kwdefaults` are set to `None` + Py_RETURN_NONE; // This can happen when `kwdefaults` are set to `None` } } @@ -90,7 +90,7 @@ function_set_kw_defaults(TyObject *self, TyObject *args) int result = TyFunction_SetKwDefaults(func, defaults); if (result == -1) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -103,7 +103,7 @@ function_get_closure(TyObject *self, TyObject *func) } else if (TyErr_Occurred()) { return NULL; } else { - Ty_RETURN_NONE; // This can happen when `closure` is set to `None` + Py_RETURN_NONE; // This can happen when `closure` is set to `None` } } @@ -119,7 +119,7 @@ function_set_closure(TyObject *self, TyObject *args) if (result == -1) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testcapi/gc.c b/Modules/_testcapi/gc.c index 5e6488a..599df92 100644 --- a/Modules/_testcapi/gc.c +++ b/Modules/_testcapi/gc.c @@ -1,7 +1,7 @@ #include "parts.h" static TyObject* -test_gc_control(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_gc_control(TyObject *self, TyObject *Py_UNUSED(ignored)) { int orig_enabled = TyGC_IsEnabled(); const char* msg = "ok"; @@ -49,7 +49,7 @@ test_gc_control(TyObject *self, TyObject *Ty_UNUSED(ignored)) } } - Ty_RETURN_NONE; + Py_RETURN_NONE; failed: /* Try to clean up if we can. */ @@ -63,7 +63,7 @@ failed: } static TyObject * -without_gc(TyObject *Ty_UNUSED(self), TyObject *obj) +without_gc(TyObject *Py_UNUSED(self), TyObject *obj) { TyTypeObject *tp = (TyTypeObject*)obj; if (!TyType_Check(obj) || !TyType_HasFeature(tp, Ty_TPFLAGS_HEAPTYPE)) { @@ -171,8 +171,8 @@ gc_visit_callback_basic(TyObject *obj, void *arg) } static TyObject * -test_gc_visit_objects_basic(TyObject *Ty_UNUSED(self), - TyObject *Ty_UNUSED(ignored)) +test_gc_visit_objects_basic(TyObject *Py_UNUSED(self), + TyObject *Py_UNUSED(ignored)) { TyObject *obj; struct gc_visit_state_basic state; @@ -192,7 +192,7 @@ test_gc_visit_objects_basic(TyObject *Ty_UNUSED(self), "test_gc_visit_objects_basic: Didn't find live list"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -207,8 +207,8 @@ gc_visit_callback_exit_early(TyObject *obj, void *arg) } static TyObject * -test_gc_visit_objects_exit_early(TyObject *Ty_UNUSED(self), - TyObject *Ty_UNUSED(ignored)) +test_gc_visit_objects_exit_early(TyObject *Py_UNUSED(self), + TyObject *Py_UNUSED(ignored)) { int visited_i = 0; PyUnstable_GC_VisitObjects(gc_visit_callback_exit_early, &visited_i); @@ -217,7 +217,7 @@ test_gc_visit_objects_exit_early(TyObject *Ty_UNUSED(self), TyExc_AssertionError, "test_gc_visit_objects_exit_early: did not exit when expected"); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } typedef struct { @@ -243,18 +243,18 @@ obj_extra_data_get_extra_storage(TyObject *self) } static TyObject * -obj_extra_data_get(TyObject *self, void *Ty_UNUSED(ignored)) +obj_extra_data_get(TyObject *self, void *Py_UNUSED(ignored)) { TyObject **extra_storage = obj_extra_data_get_extra_storage(self); TyObject *value = *extra_storage; if (!value) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(value); } static int -obj_extra_data_set(TyObject *self, TyObject *newval, void *Ty_UNUSED(ignored)) +obj_extra_data_set(TyObject *self, TyObject *newval, void *Py_UNUSED(ignored)) { TyObject **extra_storage = obj_extra_data_get_extra_storage(self); Ty_CLEAR(*extra_storage); diff --git a/Modules/_testcapi/getargs.c b/Modules/_testcapi/getargs.c index a3d5b35..348a9e5 100644 --- a/Modules/_testcapi/getargs.c +++ b/Modules/_testcapi/getargs.c @@ -254,7 +254,7 @@ test_w_code_invalid(TyObject *self, TyObject *arg) Ty_DECREF(args); Ty_DECREF(kwargs); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -591,7 +591,7 @@ getargs_z(TyObject *self, TyObject *args) if (str != NULL) { return TyBytes_FromString(str); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -623,7 +623,7 @@ getargs_z_hash(TyObject *self, TyObject *args) if (str != NULL) { return TyBytes_FromStringAndSize(str, size); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -762,7 +762,7 @@ gh_99240_clear_args(TyObject *self, TyObject *args) } TyMem_Free(a); TyMem_Free(b); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef test_methods[] = { diff --git a/Modules/_testcapi/hash.c b/Modules/_testcapi/hash.c index d17d1a2..eab7479 100644 --- a/Modules/_testcapi/hash.c +++ b/Modules/_testcapi/hash.c @@ -2,7 +2,7 @@ #include "util.h" static TyObject * -hash_getfuncdef(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) +hash_getfuncdef(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(args)) { // bind PyHash_GetFuncDef() PyHash_FuncDef *def = PyHash_GetFuncDef(); @@ -54,7 +54,7 @@ long_from_hash(Ty_hash_t hash) static TyObject * -hash_pointer(TyObject *Ty_UNUSED(module), TyObject *arg) +hash_pointer(TyObject *Py_UNUSED(module), TyObject *arg) { void *ptr = TyLong_AsVoidPtr(arg); if (ptr == NULL && TyErr_Occurred()) { @@ -67,7 +67,7 @@ hash_pointer(TyObject *Ty_UNUSED(module), TyObject *arg) static TyObject * -hash_buffer(TyObject *Ty_UNUSED(module), TyObject *args) +hash_buffer(TyObject *Py_UNUSED(module), TyObject *args) { char *ptr; Ty_ssize_t len; @@ -81,7 +81,7 @@ hash_buffer(TyObject *Ty_UNUSED(module), TyObject *args) static TyObject * -object_generichash(TyObject *Ty_UNUSED(module), TyObject *arg) +object_generichash(TyObject *Py_UNUSED(module), TyObject *arg) { NULLABLE(arg); Ty_hash_t hash = PyObject_GenericHash(arg); diff --git a/Modules/_testcapi/heaptype.c b/Modules/_testcapi/heaptype.c index 25e5f29..050d4b2 100644 --- a/Modules/_testcapi/heaptype.c +++ b/Modules/_testcapi/heaptype.c @@ -52,7 +52,7 @@ static TyType_Spec MinimalType_spec = { static TyObject * -test_from_spec_metatype_inheritance(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_from_spec_metatype_inheritance(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *metaclass = NULL; TyObject *class = NULL; @@ -108,7 +108,7 @@ finally: static TyObject * -test_from_spec_invalid_metatype_inheritance(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_from_spec_invalid_metatype_inheritance(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *metaclass_a = NULL; TyObject *metaclass_b = NULL; @@ -202,7 +202,7 @@ simple_str(TyObject *self) { static TyObject * -test_type_from_ephemeral_spec(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_type_from_ephemeral_spec(TyObject *self, TyObject *Py_UNUSED(ignored)) { // Test that a heap type can be created from a spec that's later deleted // (along with all its contents). @@ -902,7 +902,7 @@ static TyGetSetDef heapctypewithdict_getsetlist[] = { static struct TyMemberDef heapctypewithdict_members[] = { {"dictobj", _Ty_T_OBJECT, offsetof(HeapCTypeWithDictObject, dict)}, - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(HeapCTypeWithDictObject, dict), Ty_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(HeapCTypeWithDictObject, dict), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -998,7 +998,7 @@ static TyType_Spec HeapCTypeWithManagedWeakref_spec = { static struct TyMemberDef heapctypewithnegativedict_members[] = { {"dictobj", _Ty_T_OBJECT, offsetof(HeapCTypeWithDictObject, dict)}, - {"__dictoffset__", Ty_T_PYSSIZET, -(Ty_ssize_t)sizeof(void*), Ty_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, -(Ty_ssize_t)sizeof(void*), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -1025,7 +1025,7 @@ typedef struct { static struct TyMemberDef heapctypewithweakref_members[] = { {"weakreflist", _Ty_T_OBJECT, offsetof(HeapCTypeWithWeakrefObject, weakreflist)}, {"__weaklistoffset__", Ty_T_PYSSIZET, - offsetof(HeapCTypeWithWeakrefObject, weakreflist), Ty_READONLY}, + offsetof(HeapCTypeWithWeakrefObject, weakreflist), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -1100,7 +1100,7 @@ heapctypesetattr_setattro(TyObject *op, TyObject *attr, TyObject *value) TyObject *svalue = TyUnicode_FromString("value"); if (svalue == NULL) return -1; - int eq = PyObject_RichCompareBool(svalue, attr, Ty_EQ); + int eq = PyObject_RichCompareBool(svalue, attr, Py_EQ); Ty_DECREF(svalue); if (eq < 0) return -1; diff --git a/Modules/_testcapi/immortal.c b/Modules/_testcapi/immortal.c index 71be686..16b07a3 100644 --- a/Modules/_testcapi/immortal.c +++ b/Modules/_testcapi/immortal.c @@ -15,18 +15,18 @@ int verify_immortality(TyObject *object) } static TyObject * -test_immortal_builtins(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_immortal_builtins(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *objects[] = {Ty_True, Ty_False, Ty_None, Ty_Ellipsis}; Ty_ssize_t n = Ty_ARRAY_LENGTH(objects); for (Ty_ssize_t i = 0; i < n; i++) { assert(verify_immortality(objects[i])); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_immortal_small_ints(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_immortal_small_ints(TyObject *self, TyObject *Py_UNUSED(ignored)) { for (int i = -5; i <= 256; i++) { TyObject *obj = TyLong_FromLong(i); @@ -41,7 +41,7 @@ test_immortal_small_ints(TyObject *self, TyObject *Ty_UNUSED(ignored)) assert(!has_int_immortal_bit); Ty_DECREF(obj); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * diff --git a/Modules/_testcapi/list.c b/Modules/_testcapi/list.c index 39d8764..190a953 100644 --- a/Modules/_testcapi/list.c +++ b/Modules/_testcapi/list.c @@ -3,7 +3,7 @@ static TyObject * -list_get_size(TyObject *Ty_UNUSED(module), TyObject *obj) +list_get_size(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); RETURN_SIZE(TyList_GET_SIZE(obj)); @@ -11,7 +11,7 @@ list_get_size(TyObject *Ty_UNUSED(module), TyObject *obj) static TyObject * -list_get_item(TyObject *Ty_UNUSED(module), TyObject *args) +list_get_item(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t i; @@ -24,7 +24,7 @@ list_get_item(TyObject *Ty_UNUSED(module), TyObject *args) static TyObject * -list_set_item(TyObject *Ty_UNUSED(module), TyObject *args) +list_set_item(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj, *value; Ty_ssize_t i; @@ -34,13 +34,13 @@ list_set_item(TyObject *Ty_UNUSED(module), TyObject *args) NULLABLE(obj); NULLABLE(value); TyList_SET_ITEM(obj, i, Ty_XNewRef(value)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -list_clear(TyObject* Ty_UNUSED(module), TyObject *obj) +list_clear(TyObject* Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); RETURN_INT(TyList_Clear(obj)); @@ -48,7 +48,7 @@ list_clear(TyObject* Ty_UNUSED(module), TyObject *obj) static TyObject * -list_extend(TyObject* Ty_UNUSED(module), TyObject *args) +list_extend(TyObject* Py_UNUSED(module), TyObject *args) { TyObject *obj, *arg; if (!TyArg_ParseTuple(args, "OO", &obj, &arg)) { @@ -61,7 +61,7 @@ list_extend(TyObject* Ty_UNUSED(module), TyObject *args) static TyObject* -test_list_api(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_list_api(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject* list; int i; @@ -99,7 +99,7 @@ test_list_api(TyObject *self, TyObject *Ty_UNUSED(ignored)) Ty_DECREF(list); #undef NLIST - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testcapi/long.c b/Modules/_testcapi/long.c index 3ed764a..4986ece 100644 --- a/Modules/_testcapi/long.c +++ b/Modules/_testcapi/long.c @@ -255,7 +255,7 @@ error: static TyObject * -get_pylong_layout(TyObject *module, TyObject *Ty_UNUSED(args)) +get_pylong_layout(TyObject *module, TyObject *Py_UNUSED(args)) { const PyLongLayout *layout = TyLong_GetNativeLayout(); return layout_to_dict(layout); diff --git a/Modules/_testcapi/mem.c b/Modules/_testcapi/mem.c index 258ef0f..777a2b2 100644 --- a/Modules/_testcapi/mem.c +++ b/Modules/_testcapi/mem.c @@ -167,14 +167,14 @@ set_nomemory(TyObject *self, TyObject *args) return NULL; } fm_setup_hooks(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -remove_mem_hooks(TyObject *self, TyObject *Ty_UNUSED(ignored)) +remove_mem_hooks(TyObject *self, TyObject *Py_UNUSED(ignored)) { fm_remove_hooks(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -337,13 +337,13 @@ finally: } static TyObject * -test_pyobject_setallocators(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_pyobject_setallocators(TyObject *self, TyObject *Py_UNUSED(ignored)) { return test_setallocators(PYMEM_DOMAIN_OBJ); } static TyObject * -test_pyobject_new(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_pyobject_new(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *obj; TyTypeObject *type = &PyBaseObject_Type; @@ -377,7 +377,7 @@ test_pyobject_new(TyObject *self, TyObject *Ty_UNUSED(ignored)) } Ty_DECREF(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; alloc_failed: TyErr_NoMemory(); @@ -385,7 +385,7 @@ alloc_failed: } static TyObject * -test_pymem_alloc0(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_pymem_alloc0(TyObject *self, TyObject *Py_UNUSED(ignored)) { void *ptr; @@ -437,17 +437,17 @@ test_pymem_alloc0(TyObject *self, TyObject *Ty_UNUSED(ignored)) } PyObject_Free(ptr); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_pymem_setrawallocators(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_pymem_setrawallocators(TyObject *self, TyObject *Py_UNUSED(ignored)) { return test_setallocators(PYMEM_DOMAIN_RAW); } static TyObject * -test_pymem_setallocators(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_pymem_setallocators(TyObject *self, TyObject *Py_UNUSED(ignored)) { return test_setallocators(PYMEM_DOMAIN_MEM); } @@ -465,7 +465,7 @@ pyobject_malloc_without_gil(TyObject *self, TyObject *args) PyObject_Free(buffer); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -483,7 +483,7 @@ pymem_buffer_overflow(TyObject *self, TyObject *args) buffer[16] = 'x'; TyMem_Free(buffer); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -496,7 +496,7 @@ pymem_api_misuse(TyObject *self, TyObject *args) buffer = TyMem_Malloc(16); TyMem_RawFree(buffer); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -512,7 +512,7 @@ pymem_malloc_without_gil(TyObject *self, TyObject *args) TyMem_Free(buffer); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -549,7 +549,7 @@ tracemalloc_track(TyObject *self, TyObject *args) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -581,7 +581,7 @@ tracemalloc_untrack(TyObject *self, TyObject *args) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -668,7 +668,7 @@ tracemalloc_track_race(TyObject *self, TyObject *args) PyThread_type_lock lock = locks[i]; PyThread_free_lock(lock); } - Ty_RETURN_NONE; + Py_RETURN_NONE; error: Ty_CLEAR(tracemalloc); diff --git a/Modules/_testcapi/monitoring.c b/Modules/_testcapi/monitoring.c index f92138c..ce24067 100644 --- a/Modules/_testcapi/monitoring.c +++ b/Modules/_testcapi/monitoring.c @@ -480,14 +480,14 @@ enter_scope(TyObject *self, TyObject *args) events, num_events); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * exit_scope(TyObject *self, TyObject *args) { PyMonitoring_ExitScope(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef TestMethods[] = { diff --git a/Modules/_testcapi/object.c b/Modules/_testcapi/object.c index 388cd69..9810384 100644 --- a/Modules/_testcapi/object.c +++ b/Modules/_testcapi/object.c @@ -28,7 +28,7 @@ call_pyobject_print(TyObject *self, TyObject * args) fclose(fp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -50,7 +50,7 @@ pyobject_print_null(TyObject *self, TyObject *args) fclose(fp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -114,14 +114,14 @@ pyobject_print_os_error(TyObject *self, TyObject *args) fclose(fp); Ty_DECREF(test_string); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * pyobject_clear_weakrefs_no_callbacks(TyObject *self, TyObject *obj) { PyUnstable_Object_ClearWeakRefsNoCallbacks(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -189,7 +189,7 @@ test_py_try_inc_ref(TyObject *self, TyObject *unused) Ty_DECREF(op); // undo try-incref Ty_DECREF(op); // dealloc assert(MyObject_dealloc_called == 1); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -200,59 +200,59 @@ _test_incref(TyObject *ob) } static TyObject * -test_xincref_doesnt_leak(TyObject *ob, TyObject *Ty_UNUSED(ignored)) +test_xincref_doesnt_leak(TyObject *ob, TyObject *Py_UNUSED(ignored)) { TyObject *obj = TyLong_FromLong(0); Ty_XINCREF(_test_incref(obj)); Ty_DECREF(obj); Ty_DECREF(obj); Ty_DECREF(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_incref_doesnt_leak(TyObject *ob, TyObject *Ty_UNUSED(ignored)) +test_incref_doesnt_leak(TyObject *ob, TyObject *Py_UNUSED(ignored)) { TyObject *obj = TyLong_FromLong(0); Ty_INCREF(_test_incref(obj)); Ty_DECREF(obj); Ty_DECREF(obj); Ty_DECREF(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_xdecref_doesnt_leak(TyObject *ob, TyObject *Ty_UNUSED(ignored)) +test_xdecref_doesnt_leak(TyObject *ob, TyObject *Py_UNUSED(ignored)) { Ty_XDECREF(TyLong_FromLong(0)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_decref_doesnt_leak(TyObject *ob, TyObject *Ty_UNUSED(ignored)) +test_decref_doesnt_leak(TyObject *ob, TyObject *Py_UNUSED(ignored)) { Ty_DECREF(TyLong_FromLong(0)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_incref_decref_API(TyObject *ob, TyObject *Ty_UNUSED(ignored)) +test_incref_decref_API(TyObject *ob, TyObject *Py_UNUSED(ignored)) { TyObject *obj = TyLong_FromLong(0); Ty_IncRef(obj); Ty_DecRef(obj); Ty_DecRef(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef Ty_REF_DEBUG static TyObject * -negative_refcount(TyObject *self, TyObject *Ty_UNUSED(args)) +negative_refcount(TyObject *self, TyObject *Py_UNUSED(args)) { TyObject *obj = TyUnicode_FromString("negative_refcount"); if (obj == NULL) { @@ -264,12 +264,12 @@ negative_refcount(TyObject *self, TyObject *Ty_UNUSED(args)) /* Ty_DECREF() must call _Ty_NegativeRefcount() and abort Python */ Ty_DECREF(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -decref_freed_object(TyObject *self, TyObject *Ty_UNUSED(args)) +decref_freed_object(TyObject *self, TyObject *Py_UNUSED(args)) { TyObject *obj = TyUnicode_FromString("decref_freed_object"); if (obj == NULL) { @@ -285,14 +285,14 @@ decref_freed_object(TyObject *self, TyObject *Ty_UNUSED(args)) // _Ty_NegativeRefcount() and abort Python. Ty_DECREF(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif // Test Ty_CLEAR() macro static TyObject* -test_py_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_py_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { // simple case with a variable TyObject *obj = TyList_New(0); @@ -314,13 +314,13 @@ test_py_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) assert(array[0] == NULL); assert(p == array + 1); - Ty_RETURN_NONE; + Py_RETURN_NONE; } // Test Ty_SETREF() and Ty_XSETREF() macros, similar to test_py_clear() static TyObject* -test_py_setref(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_py_setref(TyObject *self, TyObject *Py_UNUSED(ignored)) { // Ty_SETREF() simple case with a variable TyObject *obj = TyList_New(0); @@ -371,7 +371,7 @@ test_py_setref(TyObject *self, TyObject *Ty_UNUSED(ignored)) assert(array2[0] == NULL); assert(p2 == array2 + 1); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -398,13 +398,13 @@ test_py_setref(TyObject *self, TyObject *Ty_UNUSED(ignored)) assert(Ty_XNewRef(NULL) == NULL); \ \ Ty_DECREF(obj); \ - Ty_RETURN_NONE; \ + Py_RETURN_NONE; \ } while (0) // Test Ty_NewRef() and Ty_XNewRef() macros static TyObject* -test_refcount_macros(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_refcount_macros(TyObject *self, TyObject *Py_UNUSED(ignored)) { TEST_REFCOUNT(); } @@ -414,7 +414,7 @@ test_refcount_macros(TyObject *self, TyObject *Ty_UNUSED(ignored)) // Test Ty_NewRef() and Ty_XNewRef() functions, after undefining macros. static TyObject* -test_refcount_funcs(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_refcount_funcs(TyObject *self, TyObject *Py_UNUSED(ignored)) { TEST_REFCOUNT(); } @@ -450,12 +450,12 @@ test_refcount_funcs(TyObject *self, TyObject *Ty_UNUSED(ignored)) assert(!Ty_Is(obj, o_false)); \ \ Ty_DECREF(obj); \ - Ty_RETURN_NONE; \ + Py_RETURN_NONE; \ } while (0) // Test Ty_Is() macro static TyObject* -test_py_is_macros(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_py_is_macros(TyObject *self, TyObject *Py_UNUSED(ignored)) { TEST_PY_IS(); } @@ -464,7 +464,7 @@ test_py_is_macros(TyObject *self, TyObject *Ty_UNUSED(ignored)) // Test Ty_Is() function, after undefining its macro. static TyObject* -test_py_is_funcs(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_py_is_funcs(TyObject *self, TyObject *Py_UNUSED(ignored)) { TEST_PY_IS(); } @@ -474,7 +474,7 @@ static TyObject * clear_managed_dict(TyObject *self, TyObject *obj) { PyObject_ClearManagedDict(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testcapi/pyatomic.c b/Modules/_testcapi/pyatomic.c index 4ce8d42..adcccc3 100644 --- a/Modules/_testcapi/pyatomic.c +++ b/Modules/_testcapi/pyatomic.c @@ -49,7 +49,7 @@ test_atomic_add_##suffix(TyObject *self, TyObject *obj) { \ assert(x == (dtype)-3); \ assert(_Ty_atomic_add_##suffix(&x, 2) == (dtype)-3); \ assert(x == (dtype)-1); \ - Ty_RETURN_NONE; \ + Py_RETURN_NONE; \ } FOR_ARITHMETIC_TYPES(IMPL_TEST_ADD) @@ -68,7 +68,7 @@ test_atomic_compare_exchange_##suffix(TyObject *self, TyObject *obj) { \ assert(_Ty_atomic_compare_exchange_##suffix(&x, &y, z) == 0); \ assert(x == z); \ assert(y == z); \ - Ty_RETURN_NONE; \ + Py_RETURN_NONE; \ } FOR_ALL_TYPES(IMPL_TEST_COMPARE_EXCHANGE) @@ -84,7 +84,7 @@ test_atomic_exchange_##suffix(TyObject *self, TyObject *obj) { \ assert(x == (dtype)2); \ assert(_Ty_atomic_exchange_##suffix(&x, y) == (dtype)2); \ assert(x == (dtype)1); \ - Ty_RETURN_NONE; \ + Py_RETURN_NONE; \ } FOR_ALL_TYPES(IMPL_TEST_EXCHANGE) @@ -102,7 +102,7 @@ test_atomic_load_store_##suffix(TyObject *self, TyObject *obj) { \ _Ty_atomic_store_##suffix##_relaxed(&x, z); \ assert(_Ty_atomic_load_##suffix##_relaxed(&x) == (dtype)2); \ assert(x == (dtype)2); \ - Ty_RETURN_NONE; \ + Py_RETURN_NONE; \ } FOR_ALL_TYPES(IMPL_TEST_LOAD_STORE) @@ -116,7 +116,7 @@ test_atomic_and_or_##suffix(TyObject *self, TyObject *obj) { \ assert(x == (dtype)3); \ assert(_Ty_atomic_and_##suffix(&x, y) == (dtype)3); \ assert(x == (dtype)1); \ - Ty_RETURN_NONE; \ + Py_RETURN_NONE; \ } FOR_BITWISE_TYPES(IMPL_TEST_AND_OR) @@ -127,7 +127,7 @@ test_atomic_fences(TyObject *self, TyObject *obj) { _Ty_atomic_fence_seq_cst(); _Ty_atomic_fence_acquire(); _Ty_atomic_fence_release(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -138,7 +138,7 @@ test_atomic_release_acquire(TyObject *self, TyObject *obj) { _Ty_atomic_store_ptr_release(&x, y); assert(x == y); assert(_Ty_atomic_load_ptr_acquire(&x) == y); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -153,7 +153,7 @@ test_atomic_load_store_int_release_acquire(TyObject *self, TyObject *obj) { \ _Ty_atomic_store_int_release(&x, z); assert(x == z); assert(_Ty_atomic_load_int_acquire(&x) == z); - Ty_RETURN_NONE; + Py_RETURN_NONE; } // NOTE: all tests should start with "test_atomic_" to be included diff --git a/Modules/_testcapi/set.c b/Modules/_testcapi/set.c index 2c1c35f..4e2addf 100644 --- a/Modules/_testcapi/set.c +++ b/Modules/_testcapi/set.c @@ -10,7 +10,7 @@ set_get_size(TyObject *self, TyObject *obj) static TyObject* -test_set_type_size(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_set_type_size(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *obj = TyList_New(0); if (obj == NULL) { @@ -27,7 +27,7 @@ test_set_type_size(TyObject *self, TyObject *Ty_UNUSED(ignored)) Ty_SET_SIZE(obj, 0); Ty_DECREF(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testcapi/time.c b/Modules/_testcapi/time.c index 73c5c0f..524b381 100644 --- a/Modules/_testcapi/time.c +++ b/Modules/_testcapi/time.c @@ -22,7 +22,7 @@ pytime_from_nanoseconds(PyTime_t *tp, TyObject *obj) static TyObject * -test_pytime_assecondsdouble(TyObject *Ty_UNUSED(self), TyObject *args) +test_pytime_assecondsdouble(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *obj; if (!TyArg_ParseTuple(args, "O", &obj)) { @@ -46,7 +46,7 @@ pytime_as_float(PyTime_t t) static TyObject* -test_pytime_monotonic(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) +test_pytime_monotonic(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(args)) { PyTime_t t; int res = PyTime_Monotonic(&t); @@ -60,7 +60,7 @@ test_pytime_monotonic(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) static TyObject* -test_pytime_monotonic_raw(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) +test_pytime_monotonic_raw(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(args)) { PyTime_t t; int res; @@ -78,7 +78,7 @@ test_pytime_monotonic_raw(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) static TyObject* -test_pytime_perf_counter(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) +test_pytime_perf_counter(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(args)) { PyTime_t t; int res = PyTime_PerfCounter(&t); @@ -92,7 +92,7 @@ test_pytime_perf_counter(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) static TyObject* -test_pytime_perf_counter_raw(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) +test_pytime_perf_counter_raw(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(args)) { PyTime_t t; int res; @@ -110,7 +110,7 @@ test_pytime_perf_counter_raw(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args static TyObject* -test_pytime_time(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) +test_pytime_time(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(args)) { PyTime_t t; int res = PyTime_Time(&t); @@ -124,7 +124,7 @@ test_pytime_time(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) static TyObject* -test_pytime_time_raw(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) +test_pytime_time_raw(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(args)) { PyTime_t t; int res; diff --git a/Modules/_testcapi/tuple.c b/Modules/_testcapi/tuple.c index 532e654..11d3b69 100644 --- a/Modules/_testcapi/tuple.c +++ b/Modules/_testcapi/tuple.c @@ -3,14 +3,14 @@ static TyObject * -tuple_get_size(TyObject *Ty_UNUSED(module), TyObject *obj) +tuple_get_size(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); RETURN_SIZE(TyTuple_GET_SIZE(obj)); } static TyObject * -tuple_get_item(TyObject *Ty_UNUSED(module), TyObject *args) +tuple_get_item(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t i; @@ -36,7 +36,7 @@ tuple_copy(TyObject *tuple) } static TyObject * -tuple_set_item(TyObject *Ty_UNUSED(module), TyObject *args) +tuple_set_item(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj, *value, *newtuple; Ty_ssize_t i; @@ -66,7 +66,7 @@ tuple_set_item(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -_tuple_resize(TyObject *Ty_UNUSED(module), TyObject *args) +_tuple_resize(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *tup; Ty_ssize_t newsize; @@ -93,7 +93,7 @@ _tuple_resize(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -_check_tuple_item_is_NULL(TyObject *Ty_UNUSED(module), TyObject *args) +_check_tuple_item_is_NULL(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t i; diff --git a/Modules/_testcapi/type.c b/Modules/_testcapi/type.c index ddffc74..5ff4d8a 100644 --- a/Modules/_testcapi/type.c +++ b/Modules/_testcapi/type.c @@ -14,7 +14,7 @@ static TyType_Spec HeapTypeNameType_Spec = { }; static TyObject * -get_heaptype_for_name(TyObject *self, TyObject *Ty_UNUSED(ignored)) +get_heaptype_for_name(TyObject *self, TyObject *Py_UNUSED(ignored)) { return TyType_FromSpec(&HeapTypeNameType_Spec); } @@ -53,7 +53,7 @@ get_type_module_name(TyObject *self, TyObject *type) static TyObject * -test_get_type_dict(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_get_type_dict(TyObject *self, TyObject *Py_UNUSED(ignored)) { /* Test for TyType_GetDict */ @@ -73,12 +73,12 @@ test_get_type_dict(TyObject *self, TyObject *Ty_UNUSED(ignored)) assert(TyDict_GetItemString(type_dict, "new_attr")); // borrowed ref Ty_DECREF(HeapTypeNameType); Ty_DECREF(type_dict); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_get_statictype_slots(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_get_statictype_slots(TyObject *self, TyObject *Py_UNUSED(ignored)) { newfunc tp_new = TyType_GetSlot(&TyLong_Type, Ty_tp_new); if (TyLong_Type.tp_new != tp_new) { @@ -129,7 +129,7 @@ test_get_statictype_slots(TyObject *self, TyObject *Ty_UNUSED(ignored)) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -160,7 +160,7 @@ type_modified(TyObject *self, TyObject *arg) TyTypeObject *type = (TyTypeObject*)arg; TyType_Modified(type); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -189,7 +189,7 @@ type_get_tp_bases(TyObject *self, TyObject *arg) TyObject *bases = type->tp_bases; if (bases == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(bases); } @@ -205,7 +205,7 @@ type_get_tp_mro(TyObject *self, TyObject *arg) TyObject *mro = ((TyTypeObject *)type)->tp_mro; if (mro == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(mro); } @@ -223,7 +223,7 @@ type_freeze(TyObject *module, TyObject *arg) if (TyType_Freeze(type) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testcapi/unicode.c b/Modules/_testcapi/unicode.c index 8597b8b..f55c908 100644 --- a/Modules/_testcapi/unicode.c +++ b/Modules/_testcapi/unicode.c @@ -307,7 +307,7 @@ writer_write_char(TyObject *self_raw, TyObject *args) if (PyUnicodeWriter_WriteChar(self->writer, ch) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -328,7 +328,7 @@ writer_write_utf8(TyObject *self_raw, TyObject *args) if (PyUnicodeWriter_WriteUTF8(self->writer, str, size) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -349,7 +349,7 @@ writer_write_ascii(TyObject *self_raw, TyObject *args) if (PyUnicodeWriter_WriteASCII(self->writer, str, size) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -377,7 +377,7 @@ writer_write_widechar(TyObject *self_raw, TyObject *args) if (res < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -407,7 +407,7 @@ writer_write_ucs4(TyObject *self_raw, TyObject *args) if (res < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -427,7 +427,7 @@ writer_write_str(TyObject *self_raw, TyObject *args) if (PyUnicodeWriter_WriteStr(self->writer, obj) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -447,7 +447,7 @@ writer_write_repr(TyObject *self_raw, TyObject *args) if (PyUnicodeWriter_WriteRepr(self->writer, obj) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -468,7 +468,7 @@ writer_write_substring(TyObject *self_raw, TyObject *args) if (PyUnicodeWriter_WriteSubstring(self->writer, str, start, end) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -501,7 +501,7 @@ writer_decodeutf8stateful(TyObject *self_raw, TyObject *args) if (use_consumed) { return TyLong_FromSsize_t(consumed); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -518,7 +518,7 @@ writer_get_pointer(TyObject *self_raw, TyObject *args) static TyObject* -writer_finish(TyObject *self_raw, TyObject *Ty_UNUSED(args)) +writer_finish(TyObject *self_raw, TyObject *Py_UNUSED(args)) { WriterObject *self = (WriterObject *)self_raw; if (writer_check(self) < 0) { diff --git a/Modules/_testcapi/vectorcall.c b/Modules/_testcapi/vectorcall.c index dc1e37d..03451a0 100644 --- a/Modules/_testcapi/vectorcall.c +++ b/Modules/_testcapi/vectorcall.c @@ -116,7 +116,7 @@ function_setvectorcall(TyObject *self, TyObject *func) return NULL; } TyFunction_SetVectorcall((PyFunctionObject *)func, (vectorcallfunc)override_vectorcall); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -190,7 +190,7 @@ _testcapi_VectorCallClass_set_vectorcall_impl(TyObject *self, } *(vectorcallfunc*)((char*)self + type->tp_vectorcall_offset) = ( VectorCallClass_vectorcall); - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyMethodDef VectorCallClass_methods[] = { @@ -199,7 +199,7 @@ TyMethodDef VectorCallClass_methods[] = { }; TyMemberDef VectorCallClass_members[] = { - {"__vectorcalloffset__", Ty_T_PYSSIZET, 0/* set later */, Ty_READONLY}, + {"__vectorcalloffset__", Ty_T_PYSSIZET, 0/* set later */, Py_READONLY}, {NULL} }; diff --git a/Modules/_testcapi/watchers.c b/Modules/_testcapi/watchers.c index 680ee8d..36bc339 100644 --- a/Modules/_testcapi/watchers.c +++ b/Modules/_testcapi/watchers.c @@ -127,7 +127,7 @@ clear_dict_watcher(TyObject *self, TyObject *watcher_id) assert(g_dict_watch_events); Ty_CLEAR(g_dict_watch_events); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -144,7 +144,7 @@ _testcapi_watch_dict_impl(TyObject *module, int watcher_id, TyObject *dict) if (TyDict_Watch(watcher_id, dict)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -158,11 +158,11 @@ _testcapi_unwatch_dict_impl(TyObject *module, int watcher_id, TyObject *dict) if (TyDict_Unwatch(watcher_id, dict)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -get_dict_watcher_events(TyObject *self, TyObject *Ty_UNUSED(args)) +get_dict_watcher_events(TyObject *self, TyObject *Py_UNUSED(args)) { if (!g_dict_watch_events) { TyErr_SetString(TyExc_RuntimeError, "no watchers active"); @@ -251,11 +251,11 @@ clear_type_watcher(TyObject *self, TyObject *watcher_id) assert(g_type_modified_events); Ty_CLEAR(g_type_modified_events); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -get_type_modified_events(TyObject *self, TyObject *Ty_UNUSED(args)) +get_type_modified_events(TyObject *self, TyObject *Py_UNUSED(args)) { if (!g_type_modified_events) { TyErr_SetString(TyExc_RuntimeError, "no watchers active"); @@ -278,7 +278,7 @@ _testcapi_watch_type_impl(TyObject *module, int watcher_id, TyObject *type) if (TyType_Watch(watcher_id, type)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -292,7 +292,7 @@ _testcapi_unwatch_type_impl(TyObject *module, int watcher_id, TyObject *type) if (TyType_Unwatch(watcher_id, type)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -391,7 +391,7 @@ clear_code_watcher(TyObject *self, TyObject *watcher_id) } } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -413,7 +413,7 @@ get_code_watcher_num_destroyed_events(TyObject *self, TyObject *watcher_id) } static TyObject * -allocate_too_many_code_watchers(TyObject *self, TyObject *Ty_UNUSED(args)) +allocate_too_many_code_watchers(TyObject *self, TyObject *Py_UNUSED(args)) { int watcher_ids[CODE_MAX_WATCHERS + 1]; int num_watchers = 0; @@ -440,7 +440,7 @@ allocate_too_many_code_watchers(TyObject *self, TyObject *Ty_UNUSED(args)) else if (TyErr_Occurred()) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } // Test function watchers @@ -584,7 +584,7 @@ clear_func_watcher(TyObject *self, TyObject *watcher_id_obj) assert(idx != -1); Ty_CLEAR(pyfunc_watchers[idx]); func_watcher_ids[idx] = -1; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -622,7 +622,7 @@ allocate_too_many_func_watchers(TyObject *self, TyObject *args) else if (TyErr_Occurred()) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } // Test contexct object watchers @@ -632,7 +632,7 @@ static TyObject *context_switches[NUM_CONTEXT_WATCHERS]; static int handle_context_watcher_event(int which_watcher, PyContextEvent event, TyObject *ctx) { - if (event == Ty_CONTEXT_SWITCHED) { + if (event == Py_CONTEXT_SWITCHED) { TyList_Append(context_switches[which_watcher], ctx); } else { @@ -707,15 +707,15 @@ clear_context_watcher(TyObject *self, TyObject *watcher_id) } } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -clear_context_stack(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) +clear_context_stack(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(args)) { PyThreadState *tstate = TyThreadState_Get(); if (tstate->context == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (((PyContext *)tstate->context)->ctx_prev != NULL) { TyErr_SetString(TyExc_RuntimeError, @@ -723,11 +723,11 @@ clear_context_stack(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(args)) return NULL; } Ty_CLEAR(tstate->context); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -get_context_switches(TyObject *Ty_UNUSED(self), TyObject *watcher_id) +get_context_switches(TyObject *Py_UNUSED(self), TyObject *watcher_id) { assert(TyLong_Check(watcher_id)); long watcher_id_l = TyLong_AsLong(watcher_id); @@ -742,7 +742,7 @@ get_context_switches(TyObject *Ty_UNUSED(self), TyObject *watcher_id) } static TyObject * -allocate_too_many_context_watchers(TyObject *self, TyObject *Ty_UNUSED(args)) +allocate_too_many_context_watchers(TyObject *self, TyObject *Py_UNUSED(args)) { int watcher_ids[CONTEXT_MAX_WATCHERS + 1]; int num_watchers = 0; @@ -769,7 +769,7 @@ allocate_too_many_context_watchers(TyObject *self, TyObject *Ty_UNUSED(args)) else if (TyErr_Occurred()) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -787,7 +787,7 @@ _testcapi_set_func_defaults_via_capi_impl(TyObject *module, TyObject *func, if (TyFunction_SetDefaults(func, defaults) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -802,7 +802,7 @@ _testcapi_set_func_kwdefaults_via_capi_impl(TyObject *module, TyObject *func, if (TyFunction_SetKwDefaults(func, defaults) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef test_methods[] = { diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 4d6b4c9..2cfe5c9 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -84,7 +84,7 @@ sizeof_error(TyObject *self, const char* fatname, const char* typname, } static TyObject* -test_config(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_config(TyObject *self, TyObject *Py_UNUSED(ignored)) { #define CHECK_SIZEOF(FATNAME, TYPE) \ do { \ @@ -102,11 +102,11 @@ test_config(TyObject *self, TyObject *Ty_UNUSED(ignored)) #undef CHECK_SIZEOF - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject* -test_sizeof_c_types(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_sizeof_c_types(TyObject *self, TyObject *Py_UNUSED(ignored)) { #if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))) #pragma GCC diagnostic push @@ -159,7 +159,7 @@ test_sizeof_c_types(TyObject *self, TyObject *Ty_UNUSED(ignored)) CHECK_SIZEOF(intptr_t, sizeof(void *)); CHECK_SIGNNESS(intptr_t, 1); - Ty_RETURN_NONE; + Py_RETURN_NONE; #undef IS_SIGNED #undef CHECK_SIGNESS @@ -227,7 +227,7 @@ pycompilestring(TyObject* self, TyObject *obj) { } static TyObject* -test_lazy_hash_inheritance(TyObject* self, TyObject *Ty_UNUSED(ignored)) +test_lazy_hash_inheritance(TyObject* self, TyObject *Py_UNUSED(ignored)) { TyTypeObject *type; TyObject *obj; @@ -238,7 +238,7 @@ test_lazy_hash_inheritance(TyObject* self, TyObject *Ty_UNUSED(ignored)) if (type->tp_dict != NULL) /* The type has already been initialized. This probably means -R is being used. */ - Ty_RETURN_NONE; + Py_RETURN_NONE; obj = PyObject_New(TyObject, type); @@ -286,13 +286,13 @@ test_lazy_hash_inheritance(TyObject* self, TyObject *Ty_UNUSED(ignored)) Ty_DECREF(obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * return_none(void *unused) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -379,7 +379,7 @@ test_buildvalue_N_error(TyObject *self, const char *fmt) } static TyObject * -test_buildvalue_N(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_buildvalue_N(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *arg, *res; @@ -414,11 +414,11 @@ test_buildvalue_N(TyObject *self, TyObject *Ty_UNUSED(ignored)) if (test_buildvalue_N_error(self, "{()O&(())N}") < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_buildvalue_p(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_buildvalue_p(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *res = Ty_BuildValue("p", 3); if (res == NULL) { @@ -440,23 +440,23 @@ test_buildvalue_p(TyObject *self, TyObject *Ty_UNUSED(ignored)) } Ty_DECREF(res); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -pyobject_repr_from_null(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pyobject_repr_from_null(TyObject *self, TyObject *Py_UNUSED(ignored)) { return PyObject_Repr(NULL); } static TyObject * -pyobject_str_from_null(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pyobject_str_from_null(TyObject *self, TyObject *Py_UNUSED(ignored)) { return PyObject_Str(NULL); } static TyObject * -pyobject_bytes_from_null(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pyobject_bytes_from_null(TyObject *self, TyObject *Py_UNUSED(ignored)) { return PyObject_Bytes(NULL); } @@ -470,7 +470,7 @@ set_errno(TyObject *self, TyObject *args) return NULL; errno = new_errno; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* test_thread_state spawns a thread of its own, and that thread releases @@ -551,15 +551,15 @@ test_thread_state(TyObject *self, TyObject *args) PyThread_free_lock(thread_done); if (!success) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -gilstate_ensure_release(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gilstate_ensure_release(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyGILState_STATE state = TyGILState_Ensure(); TyGILState_Release(state); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifndef MS_WINDOWS @@ -576,7 +576,7 @@ static void wait_for_lock(void *unused) { // thread that the threading module doesn't know about. static TyObject * -spawn_pthread_waiter(TyObject *self, TyObject *Ty_UNUSED(ignored)) +spawn_pthread_waiter(TyObject *self, TyObject *Py_UNUSED(ignored)) { if (wait_done) { TyErr_SetString(TyExc_RuntimeError, "thread already running"); @@ -587,18 +587,18 @@ spawn_pthread_waiter(TyObject *self, TyObject *Ty_UNUSED(ignored)) return TyErr_NoMemory(); PyThread_acquire_lock(wait_done, 1); PyThread_start_new_thread(wait_for_lock, NULL); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -end_spawned_pthread(TyObject *self, TyObject *Ty_UNUSED(ignored)) +end_spawned_pthread(TyObject *self, TyObject *Py_UNUSED(ignored)) { if (!wait_done) { TyErr_SetString(TyExc_RuntimeError, "call _spawn_pthread_waiter 1st"); return NULL; } PyThread_release_lock(wait_done); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif // not MS_WINDOWS @@ -698,7 +698,7 @@ typedef struct { } known_capsule; static TyObject * -test_capsule(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_capsule(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *object; const char *error = NULL; @@ -821,7 +821,7 @@ test_capsule(TyObject *self, TyObject *Ty_UNUSED(ignored)) if (error) { return raiseTestError(self, "test_capsule", error); } - Ty_RETURN_NONE; + Py_RETURN_NONE; #undef FAIL } @@ -944,7 +944,7 @@ profile_int(TyObject *self, TyObject* args) Ty_DECREF(op1); print_delta(7, &start, &stop); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -975,7 +975,7 @@ argparsing(TyObject *o, TyObject *args) TyErr_Clear(); return res; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* To test that the result of TyCode_NewEmpty has the right members. */ @@ -994,7 +994,7 @@ code_newempty(TyObject *self, TyObject *args) } static TyObject * -make_memoryview_from_NULL_pointer(TyObject *self, TyObject *Ty_UNUSED(ignored)) +make_memoryview_from_NULL_pointer(TyObject *self, TyObject *Py_UNUSED(ignored)) { Ty_buffer info; if (PyBuffer_FillInfo(&info, NULL, NULL, 1, 1, PyBUF_FULL_RO) < 0) @@ -1023,7 +1023,7 @@ buffer_fill_info(TyObject *self, TyObject *args) } static TyObject * -test_from_contiguous(TyObject* self, TyObject *Ty_UNUSED(ignored)) +test_from_contiguous(TyObject* self, TyObject *Py_UNUSED(ignored)) { int data[9] = {-1,-1,-1,-1,-1,-1,-1,-1,-1}; int init[5] = {0, 1, 2, 3, 4}; @@ -1069,13 +1069,13 @@ test_from_contiguous(TyObject* self, TyObject *Ty_UNUSED(ignored)) } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #if (defined(__linux__) || defined(__FreeBSD__)) && defined(__GNUC__) static TyObject * -test_pep3118_obsolete_write_locks(TyObject* self, TyObject *Ty_UNUSED(ignored)) +test_pep3118_obsolete_write_locks(TyObject* self, TyObject *Py_UNUSED(ignored)) { TyObject *b; char *dummy[1]; @@ -1108,7 +1108,7 @@ test_pep3118_obsolete_write_locks(TyObject* self, TyObject *Ty_UNUSED(ignored)) if (ret != -1 || match == 0) goto error; - Ty_RETURN_NONE; + Py_RETURN_NONE; error: TyErr_SetString(get_testerror(self), @@ -1126,7 +1126,7 @@ getbuffer_with_null_view(TyObject* self, TyObject *obj) if (PyObject_GetBuffer(obj, NULL, PyBUF_SIMPLE) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* PyBuffer_SizeFromFormat() */ @@ -1146,7 +1146,7 @@ test_PyBuffer_SizeFromFormat(TyObject *self, TyObject *args) /* Test that the fatal error from not having a current thread doesn't cause an infinite loop. Run via Lib/test/test_capi.py */ static TyObject * -crash_no_current_thread(TyObject *self, TyObject *Ty_UNUSED(ignored)) +crash_no_current_thread(TyObject *self, TyObject *Py_UNUSED(ignored)) { Ty_BEGIN_ALLOW_THREADS /* Using TyThreadState_Get() directly allows the test to pass in @@ -1160,7 +1160,7 @@ crash_no_current_thread(TyObject *self, TyObject *Ty_UNUSED(ignored)) /* Test that the GILState thread and the "current" thread match. */ static TyObject * -test_current_tstate_matches(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_current_tstate_matches(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyThreadState *orig_tstate = TyThreadState_Get(); @@ -1191,7 +1191,7 @@ finally: TyErr_SetString(TyExc_RuntimeError, err); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* To run some code in a sub-interpreter. */ @@ -1245,8 +1245,8 @@ static TyMethodDef ml = { }; static TyObject * -test_structseq_newtype_doesnt_leak(TyObject *Ty_UNUSED(self), - TyObject *Ty_UNUSED(args)) +test_structseq_newtype_doesnt_leak(TyObject *Py_UNUSED(self), + TyObject *Py_UNUSED(args)) { PyStructSequence_Desc descr; PyStructSequence_Field descr_fields[3]; @@ -1268,12 +1268,12 @@ test_structseq_newtype_doesnt_leak(TyObject *Ty_UNUSED(self), assert(TyType_FastSubclass(structseq_type, Ty_TPFLAGS_TUPLE_SUBCLASS)); Ty_DECREF(structseq_type); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_structseq_newtype_null_descr_doc(TyObject *Ty_UNUSED(self), - TyObject *Ty_UNUSED(args)) +test_structseq_newtype_null_descr_doc(TyObject *Py_UNUSED(self), + TyObject *Py_UNUSED(args)) { PyStructSequence_Field descr_fields[1] = { (PyStructSequence_Field){NULL, NULL} @@ -1287,7 +1287,7 @@ test_structseq_newtype_null_descr_doc(TyObject *Ty_UNUSED(self), assert(TyType_FastSubclass(structseq_type, Ty_TPFLAGS_TUPLE_SUBCLASS)); Ty_DECREF(structseq_type); - Ty_RETURN_NONE; + Py_RETURN_NONE; } typedef struct { @@ -1363,7 +1363,7 @@ call_in_temporary_c_thread(TyObject *self, TyObject *args) PyThread_release_lock(test_c_thread.start_event); if (!wait) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } Ty_BEGIN_ALLOW_THREADS @@ -1387,7 +1387,7 @@ exit: } static TyObject * -join_temporary_c_thread(TyObject *self, TyObject *Ty_UNUSED(ignored)) +join_temporary_c_thread(TyObject *self, TyObject *Py_UNUSED(ignored)) { Ty_BEGIN_ALLOW_THREADS PyThread_acquire_lock(test_c_thread.exit_event, 1); @@ -1398,7 +1398,7 @@ join_temporary_c_thread(TyObject *self, TyObject *Ty_UNUSED(ignored)) test_c_thread.start_event = NULL; PyThread_free_lock(test_c_thread.exit_event); test_c_thread.exit_event = NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* marshal */ @@ -1425,7 +1425,7 @@ pymarshal_write_long_to_file(TyObject* self, TyObject *args) assert(!TyErr_Occurred()); fclose(fp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject* @@ -1450,7 +1450,7 @@ pymarshal_write_object_to_file(TyObject* self, TyObject *args) assert(!TyErr_Occurred()); fclose(fp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject* @@ -1565,7 +1565,7 @@ return_result_with_error(TyObject *self, TyObject *args) /* invalid call: return a result with an error set, * _Ty_CheckFunctionResult() must detect such bug at runtime. */ TyErr_SetNone(TyExc_ValueError); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1681,7 +1681,7 @@ test_pythread_tss_key_state(TyObject *self, TyObject *args) } PyThread_tss_free(ptr_key); ptr_key = NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1719,7 +1719,7 @@ static TyObject* _null_to_none(TyObject* obj) { if (obj == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(obj); } @@ -1743,7 +1743,7 @@ meth_o(TyObject* self, TyObject* obj) } static TyObject* -meth_noargs(TyObject* self, TyObject *Ty_UNUSED(dummy)) +meth_noargs(TyObject* self, TyObject *Py_UNUSED(dummy)) { return _null_to_none(self); } @@ -1858,7 +1858,7 @@ get_basic_static_type(TyObject *self, TyObject *args) // Test PyThreadState C API static TyObject * -test_tstate_capi(TyObject *self, TyObject *Ty_UNUSED(args)) +test_tstate_capi(TyObject *self, TyObject *Py_UNUSED(args)) { // TyThreadState_Get() PyThreadState *tstate = TyThreadState_Get(); @@ -1898,7 +1898,7 @@ test_tstate_capi(TyObject *self, TyObject *Ty_UNUSED(args)) uint64_t id = TyThreadState_GetID(tstate); assert(id >= 1); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -2003,7 +2003,7 @@ exit: } static TyObject * -get_feature_macros(TyObject *self, TyObject *Ty_UNUSED(args)) +get_feature_macros(TyObject *self, TyObject *Py_UNUSED(args)) { TyObject *result = TyDict_New(); if (!result) { @@ -2015,7 +2015,7 @@ get_feature_macros(TyObject *self, TyObject *Ty_UNUSED(args)) } static TyObject * -test_code_api(TyObject *self, TyObject *Ty_UNUSED(args)) +test_code_api(TyObject *self, TyObject *Py_UNUSED(args)) { PyCodeObject *co = TyCode_NewEmpty("_testcapi", "dummy", 1); if (co == NULL) { @@ -2090,7 +2090,7 @@ test_code_api(TyObject *self, TyObject *Ty_UNUSED(args)) Ty_DECREF(co_freevars); } Ty_DECREF(co); - Ty_RETURN_NONE; + Py_RETURN_NONE; fail: Ty_DECREF(co); return NULL; @@ -2138,7 +2138,7 @@ settrace_to_record(TyObject *self, TyObject *list) return NULL; } TyEval_SetTrace(record_func, list); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -2165,11 +2165,11 @@ settrace_to_error(TyObject *self, TyObject *list) return NULL; } TyEval_SetTrace(error_func, list); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_macros(TyObject *self, TyObject *Ty_UNUSED(args)) +test_macros(TyObject *self, TyObject *Py_UNUSED(args)) { struct MyStruct { int x; @@ -2201,11 +2201,11 @@ test_macros(TyObject *self, TyObject *Ty_UNUSED(args)) assert(_Ty_IS_TYPE_SIGNED(int)); assert(!_Ty_IS_TYPE_SIGNED(unsigned int)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_weakref_capi(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) +test_weakref_capi(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(args)) { // Ignore PyWeakref_GetObject() deprecation, we test it on purpose _Ty_COMP_DIAG_PUSH @@ -2312,7 +2312,7 @@ test_weakref_capi(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) Ty_DECREF(weakref); - Ty_RETURN_NONE; + Py_RETURN_NONE; _Ty_COMP_DIAG_POP } @@ -2336,7 +2336,7 @@ static int _simpletracer(TyObject *obj, PyRefTracerEvent event, void* data) { } static TyObject * -test_reftracer(TyObject *ob, TyObject *Ty_UNUSED(ignored)) +test_reftracer(TyObject *ob, TyObject *Py_UNUSED(ignored)) { // Save the current tracer and data to restore it later void* current_data; @@ -2395,23 +2395,23 @@ test_reftracer(TyObject *ob, TyObject *Ty_UNUSED(ignored)) goto failed; } PyRefTracer_SetTracer(current_tracer, current_data); - Ty_RETURN_NONE; + Py_RETURN_NONE; failed: PyRefTracer_SetTracer(current_tracer, current_data); return NULL; } static TyObject * -function_set_warning(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) +function_set_warning(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(args)) { if (TyErr_WarnEx(TyExc_RuntimeWarning, "Testing TyErr_WarnEx", 2)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_critical_sections(TyObject *module, TyObject *Ty_UNUSED(args)) +test_critical_sections(TyObject *module, TyObject *Py_UNUSED(args)) { Ty_BEGIN_CRITICAL_SECTION(module); Ty_END_CRITICAL_SECTION(); @@ -2419,13 +2419,13 @@ test_critical_sections(TyObject *module, TyObject *Ty_UNUSED(args)) Ty_BEGIN_CRITICAL_SECTION2(module, module); Ty_END_CRITICAL_SECTION2(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } // Used by `finalize_thread_hang`. #if defined(_POSIX_THREADS) && !defined(__wasi__) -static void finalize_thread_hang_cleanup_callback(void *Ty_UNUSED(arg)) { +static void finalize_thread_hang_cleanup_callback(void *Py_UNUSED(arg)) { // Should not reach here. Ty_FatalError("pthread thread termination was triggered unexpectedly"); } @@ -2448,7 +2448,7 @@ finalize_thread_hang(TyObject *self, TyObject *callback) #if defined(_POSIX_THREADS) && !defined(__wasi__) pthread_cleanup_pop(0); #endif - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2469,7 +2469,7 @@ atexit_callback(void *data) } static TyObject * -test_atexit(TyObject *self, TyObject *Ty_UNUSED(args)) +test_atexit(TyObject *self, TyObject *Py_UNUSED(args)) { PyThreadState *oldts = TyThreadState_Swap(NULL); PyThreadState *tstate = Ty_NewInterpreter(); @@ -2497,7 +2497,7 @@ test_atexit(TyObject *self, TyObject *Ty_UNUSED(args)) TyErr_SetString(TyExc_RuntimeError, "atexit callback not called"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject* @@ -2543,7 +2543,7 @@ toggle_reftrace_printer(TyObject *ob, TyObject *arg) else { PyRefTracer_SetTracer(NULL, NULL); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef TestMethods[] = { @@ -2949,7 +2949,7 @@ generic_alias_dealloc(TyObject *op) } static TyObject * -generic_alias_mro_entries(TyObject *op, TyObject *Ty_UNUSED(bases)) +generic_alias_mro_entries(TyObject *op, TyObject *Py_UNUSED(bases)) { PyGenericAliasObject *self = (PyGenericAliasObject*)op; return TyTuple_Pack(1, self->item); @@ -3104,7 +3104,7 @@ ContainerNoGC_dealloc(TyObject *op) } static TyMemberDef ContainerNoGC_members[] = { - {"value", _Ty_T_OBJECT, offsetof(ContainerNoGCobject, value), Ty_READONLY, + {"value", _Ty_T_OBJECT, offsetof(ContainerNoGCobject, value), Py_READONLY, PyDoc_STR("a container value for test purposes")}, {0} }; diff --git a/Modules/_testclinic.c b/Modules/_testclinic.c index 1e58168..cc0edde 100644 --- a/Modules/_testclinic.c +++ b/Modules/_testclinic.c @@ -119,7 +119,7 @@ static TyObject * test_empty_function_impl(TyObject *module) /*[clinic end generated code: output=0f8aeb3ddced55cb input=0dd7048651ad4ae4]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1251,7 +1251,7 @@ gh_32092_oob_impl(TyObject *module, TyObject *pos1, TyObject *pos2, TyObject *varargs, TyObject *kw1, TyObject *kw2) /*[clinic end generated code: output=ee259c130054653f input=63aeeca881979b91]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1271,7 +1271,7 @@ gh_32092_kw_pass_impl(TyObject *module, TyObject *pos, TyObject *args, TyObject *kw) /*[clinic end generated code: output=4a2bbe4f7c8604e9 input=258987971f3ee97a]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1288,7 +1288,7 @@ static TyObject * gh_99233_refcount_impl(TyObject *module, TyObject *args) /*[clinic end generated code: output=585855abfbca9a7f input=f5204359fd852613]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1307,7 +1307,7 @@ static TyObject * gh_99240_double_free_impl(TyObject *module, char *a, char *b) /*[clinic end generated code: output=586dc714992fe2ed input=23db44aa91870fc7]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1340,7 +1340,7 @@ static TyObject * clone_f1_impl(TyObject *module, const char *path) /*[clinic end generated code: output=8c30b5620ba86715 input=9c614b7f025ebf70]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1352,7 +1352,7 @@ static TyObject * clone_f2_impl(TyObject *module, const char *path) /*[clinic end generated code: output=6aa1c39bec3f5d9b input=1aaaf47d6ed2324a]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1754,7 +1754,7 @@ static TyObject * depr_star_new_clone_impl(TyObject *type, TyObject *a) /*[clinic end generated code: output=3b17bf885fa736bc input=ea659285d5dbec6c]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } static struct TyMethodDef depr_star_new_methods[] = { @@ -1795,7 +1795,7 @@ static TyObject * depr_star_init_clone_impl(TyObject *self, TyObject *a) /*[clinic end generated code: output=ddfe8a1b5531e7cc input=561e103fe7f8e94f]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } static struct TyMethodDef depr_star_init_methods[] = { @@ -1934,7 +1934,7 @@ static TyObject * depr_star_pos0_len1_impl(TyObject *module, TyObject *a) /*[clinic end generated code: output=e1c6c2b423129499 input=089b9aee25381b69]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1949,7 +1949,7 @@ static TyObject * depr_star_pos0_len2_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=96df9be39859c7e4 input=65c83a32e01495c6]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1968,7 +1968,7 @@ depr_star_pos0_len3_with_kwd_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c, TyObject *d) /*[clinic end generated code: output=7f2531eda837052f input=b33f620f57d9270f]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1983,7 +1983,7 @@ static TyObject * depr_star_pos1_len1_opt_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=b5b4e326ee3b216f input=4a4b8ff72eae9ff7]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1998,7 +1998,7 @@ static TyObject * depr_star_pos1_len1_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=eab92e37d5b0a480 input=1e7787a9fe5f62a0]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2017,7 +2017,7 @@ depr_star_pos1_len2_with_kwd_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c, TyObject *d) /*[clinic end generated code: output=3bccab672b7cfbb8 input=6bc7bd742fa8be15]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2034,7 +2034,7 @@ depr_star_pos2_len1_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c) /*[clinic end generated code: output=20f5b230e9beeb70 input=5fc3e1790dec00d5]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2052,7 +2052,7 @@ depr_star_pos2_len2_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c, TyObject *d) /*[clinic end generated code: output=9f90ed8fbce27d7a input=9cc8003b89d38779]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2072,7 +2072,7 @@ depr_star_pos2_len2_with_kwd_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c, TyObject *d, TyObject *e) /*[clinic end generated code: output=05432c4f20527215 input=831832d90534da91]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2092,7 +2092,7 @@ depr_star_noinline_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c, const char *d, Ty_ssize_t d_length) /*[clinic end generated code: output=cc27dacf5c2754af input=d36cc862a2daef98]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2118,7 +2118,7 @@ depr_star_multi_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c, TyObject *h) /*[clinic end generated code: output=77681653f4202068 input=3ebd05d888a957ea]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2134,7 +2134,7 @@ static TyObject * depr_kwd_required_1_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=1d8ab19ea78418af input=53f2c398b828462d]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2152,7 +2152,7 @@ depr_kwd_required_2_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c) /*[clinic end generated code: output=44a89cb82509ddde input=a2b0ef37de8a01a7]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2168,7 +2168,7 @@ static TyObject * depr_kwd_optional_1_impl(TyObject *module, TyObject *a, TyObject *b) /*[clinic end generated code: output=a8a3d67efcc7b058 input=e416981eb78c3053]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2186,7 +2186,7 @@ depr_kwd_optional_2_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c) /*[clinic end generated code: output=aa2d967f26fdb9f6 input=cae3afb783bfc855]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2203,7 +2203,7 @@ depr_kwd_optional_3_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c) /*[clinic end generated code: output=a26025bf6118fd07 input=c9183b2f9ccaf992]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2221,7 +2221,7 @@ depr_kwd_required_optional_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c) /*[clinic end generated code: output=e53a8b7a250d8ffc input=23237a046f8388f5]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2241,7 +2241,7 @@ depr_kwd_noinline_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c, const char *d, Ty_ssize_t d_length) /*[clinic end generated code: output=f59da8113f2bad7c input=1d6db65bebb069d7]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2267,7 +2267,7 @@ depr_kwd_multi_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c, TyObject *h) /*[clinic end generated code: output=ddfbde80fe1942e1 input=7a074e621c79efd7]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2293,7 +2293,7 @@ depr_multi_impl(TyObject *module, TyObject *a, TyObject *b, TyObject *c, TyObject *d, TyObject *e, TyObject *f, TyObject *g) /*[clinic end generated code: output=f81c92852ca2d4ee input=5b847c5e44bedd02]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testclinic_limited.c b/Modules/_testclinic_limited.c index 7cb1062..603a862 100644 --- a/Modules/_testclinic_limited.c +++ b/Modules/_testclinic_limited.c @@ -34,7 +34,7 @@ static TyObject * test_empty_function_impl(TyObject *module) /*[clinic end generated code: output=0f8aeb3ddced55cb input=0dd7048651ad4ae4]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c index c9b7884..9d34bed 100644 --- a/Modules/_testinternalcapi.c +++ b/Modules/_testinternalcapi.c @@ -100,14 +100,14 @@ module _testinternalcapi [clinic start generated code]*/ /*[clinic end generated code: output=da39a3ee5e6b4b0d input=7bb583d8c9eb9a78]*/ static TyObject * -get_configs(TyObject *self, TyObject *Ty_UNUSED(args)) +get_configs(TyObject *self, TyObject *Py_UNUSED(args)) { return _Ty_GetConfigsAsDict(); } static TyObject* -get_recursion_depth(TyObject *self, TyObject *Ty_UNUSED(args)) +get_recursion_depth(TyObject *self, TyObject *Py_UNUSED(args)) { PyThreadState *tstate = _TyThreadState_GET(); @@ -116,7 +116,7 @@ get_recursion_depth(TyObject *self, TyObject *Ty_UNUSED(args)) static TyObject* -get_c_recursion_remaining(TyObject *self, TyObject *Ty_UNUSED(args)) +get_c_recursion_remaining(TyObject *self, TyObject *Py_UNUSED(args)) { PyThreadState *tstate = _TyThreadState_GET(); uintptr_t here_addr = _Ty_get_machine_stack_pointer(); @@ -127,7 +127,7 @@ get_c_recursion_remaining(TyObject *self, TyObject *Ty_UNUSED(args)) static TyObject* -test_bswap(TyObject *self, TyObject *Ty_UNUSED(args)) +test_bswap(TyObject *self, TyObject *Py_UNUSED(args)) { uint16_t u16 = _Ty_bswap16(UINT16_C(0x3412)); if (u16 != UINT16_C(0x1234)) { @@ -150,7 +150,7 @@ test_bswap(TyObject *self, TyObject *Ty_UNUSED(args)) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -171,7 +171,7 @@ check_popcount(uint32_t x, int expected) static TyObject* -test_popcount(TyObject *self, TyObject *Ty_UNUSED(args)) +test_popcount(TyObject *self, TyObject *Py_UNUSED(args)) { #define CHECK(X, RESULT) \ do { \ @@ -188,7 +188,7 @@ test_popcount(TyObject *self, TyObject *Ty_UNUSED(args)) CHECK(0x10204080, 4); CHECK(0xDEADCAFE, 22); CHECK(0xFFFFFFFF, 32); - Ty_RETURN_NONE; + Py_RETURN_NONE; #undef CHECK } @@ -211,7 +211,7 @@ check_bit_length(unsigned long x, int expected) static TyObject* -test_bit_length(TyObject *self, TyObject *Ty_UNUSED(args)) +test_bit_length(TyObject *self, TyObject *Py_UNUSED(args)) { #define CHECK(X, RESULT) \ do { \ @@ -227,7 +227,7 @@ test_bit_length(TyObject *self, TyObject *Ty_UNUSED(args)) CHECK(0x54321, 19); CHECK(0x7FFFFFFF, 31); CHECK(0xFFFFFFFF, 32); - Ty_RETURN_NONE; + Py_RETURN_NONE; #undef CHECK } @@ -260,7 +260,7 @@ hashtable_cb(_Ty_hashtable_t *table, static TyObject* -test_hashtable(TyObject *self, TyObject *Ty_UNUSED(args)) +test_hashtable(TyObject *self, TyObject *Py_UNUSED(args)) { _Ty_hashtable_t *table = _Ty_hashtable_new(hash_char, _Ty_hashtable_compare_direct); @@ -319,15 +319,15 @@ test_hashtable(TyObject *self, TyObject *Ty_UNUSED(args)) assert(_Ty_hashtable_get(table, TO_PTR('x')) == NULL); _Ty_hashtable_destroy(table); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_reset_path_config(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(arg)) +test_reset_path_config(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(arg)) { _TyPathConfig_ClearGlobal(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -383,7 +383,7 @@ exit: } static TyObject * -test_edit_cost(TyObject *self, TyObject *Ty_UNUSED(args)) +test_edit_cost(TyObject *self, TyObject *Py_UNUSED(args)) { #define CHECK(a, b, n) do { \ if (check_edit_cost(a, b, n) < 0) { \ @@ -412,7 +412,7 @@ test_edit_cost(TyObject *self, TyObject *Ty_UNUSED(args)) CHECK("AttributeError", "AttributeErrorTests", 10); #undef CHECK - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -478,7 +478,7 @@ check_bytes_find_large(Ty_ssize_t len_haystack, Ty_ssize_t len_needle, } static TyObject * -test_bytes_find(TyObject *self, TyObject *Ty_UNUSED(args)) +test_bytes_find(TyObject *self, TyObject *Py_UNUSED(args)) { #define CHECK(H, N, O, E) do { \ if (check_bytes_find(H, N, O, E) < 0) { \ @@ -524,7 +524,7 @@ test_bytes_find(TyObject *self, TyObject *Ty_UNUSED(args)) if (check_bytes_find_large(32768, 2, "ab") < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -544,7 +544,7 @@ normalize_path(TyObject *self, TyObject *filename) } static TyObject * -get_getpath_codeobject(TyObject *self, TyObject *Ty_UNUSED(args)) { +get_getpath_codeobject(TyObject *self, TyObject *Py_UNUSED(args)) { return _Ty_Get_Getpath_CodeObject(); } @@ -641,12 +641,12 @@ decode_locale_ex(TyObject *self, TyObject *args) } static TyObject * -set_eval_frame_default(TyObject *self, TyObject *Ty_UNUSED(args)) +set_eval_frame_default(TyObject *self, TyObject *Py_UNUSED(args)) { module_state *state = get_module_state(self); _TyInterpreterState_SetEvalFrameFunc(_TyInterpreterState_GET(), _TyEval_EvalFrameDefault); Ty_CLEAR(state->record_list); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -677,7 +677,7 @@ set_eval_frame_record(TyObject *self, TyObject *list) } Ty_XSETREF(state->record_list, Ty_NewRef(list)); _TyInterpreterState_SetEvalFrameFunc(_TyInterpreterState_GET(), record_eval); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -880,7 +880,7 @@ clear_extension(TyObject *self, TyObject *args) if (_TyImport_ClearExtension(name, filename) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -907,10 +907,10 @@ write_perf_map_entry(TyObject *self, TyObject *args) } static TyObject * -perf_map_state_teardown(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(ignored)) +perf_map_state_teardown(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(ignored)) { PyUnstable_PerfMapState_Fini(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1207,7 +1207,7 @@ verify_stateless_code(TyObject *self, TyObject *args, TyObject *kwargs) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef _Ty_TIER2 @@ -1221,7 +1221,7 @@ add_executor_dependency(TyObject *self, TyObject *args) return NULL; } _Ty_Executor_DependsOn((_PyExecutorObject *)exec, obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1229,7 +1229,7 @@ invalidate_executors(TyObject *self, TyObject *obj) { PyInterpreterState *interp = TyInterpreterState_Get(); _Ty_Executors_InvalidateDependency(interp, obj, 1); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -1387,7 +1387,7 @@ tracemalloc_get_traceback(TyObject *self, TyObject *args) // Test PyThreadState C API static TyObject * -test_tstate_capi(TyObject *self, TyObject *Ty_UNUSED(args)) +test_tstate_capi(TyObject *self, TyObject *Py_UNUSED(args)) { // TyThreadState_Get() PyThreadState *tstate = TyThreadState_Get(); @@ -1402,7 +1402,7 @@ test_tstate_capi(TyObject *self, TyObject *Ty_UNUSED(args)) assert(dict2 == dict); // dict2 is a borrowed reference - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1424,11 +1424,11 @@ test_pyobject_is_freed(const char *test_name, TyObject *op) "object is not seen as freed"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -check_pyobject_null_is_freed(TyObject *self, TyObject *Ty_UNUSED(args)) +check_pyobject_null_is_freed(TyObject *self, TyObject *Py_UNUSED(args)) { TyObject *op = NULL; return test_pyobject_is_freed("check_pyobject_null_is_freed", op); @@ -1437,7 +1437,7 @@ check_pyobject_null_is_freed(TyObject *self, TyObject *Ty_UNUSED(args)) static TyObject * check_pyobject_uninitialized_is_freed(TyObject *self, - TyObject *Ty_UNUSED(args)) + TyObject *Py_UNUSED(args)) { TyObject *op = (TyObject *)PyObject_Malloc(sizeof(TyObject)); if (op == NULL) { @@ -1452,7 +1452,7 @@ check_pyobject_uninitialized_is_freed(TyObject *self, static TyObject * check_pyobject_forbidden_bytes_is_freed(TyObject *self, - TyObject *Ty_UNUSED(args)) + TyObject *Py_UNUSED(args)) { /* Allocate an incomplete TyObject structure: truncate 'ob_type' field */ TyObject *op = (TyObject *)PyObject_Malloc(offsetof(TyObject, ob_type)); @@ -1468,11 +1468,11 @@ check_pyobject_forbidden_bytes_is_freed(TyObject *self, static TyObject * -check_pyobject_freed_is_freed(TyObject *self, TyObject *Ty_UNUSED(args)) +check_pyobject_freed_is_freed(TyObject *self, TyObject *Py_UNUSED(args)) { /* ASan or TSan would report an use-after-free error */ #if defined(_Ty_ADDRESS_SANITIZER) || defined(_Ty_THREAD_SANITIZER) - Ty_RETURN_NONE; + Py_RETURN_NONE; #else TyObject *op = PyObject_CallNoArgs((TyObject *)&PyBaseObject_Type); if (op == NULL) { @@ -1503,11 +1503,11 @@ get_object_dict_values(TyObject *self, TyObject *obj) { TyTypeObject *type = Ty_TYPE(obj); if (!_TyType_HasFeature(type, Ty_TPFLAGS_INLINE_VALUES)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDictValues *values = _TyObject_InlineValues(obj); if (!values->valid) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDictKeysObject *keys = ((PyHeapTypeObject *)type)->ht_cached_keys; assert(keys != NULL); @@ -1730,7 +1730,7 @@ destroy_interpreter(TyObject *self, TyObject *args, TyObject *kwargs) // use the cross interpreter _PyXI_EndInterpreter normally _PyXI_EndInterpreter(interp, NULL, NULL); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } // This exists mostly for testing the _interpreters module, as an @@ -1875,14 +1875,14 @@ normalize_interp_id(TyObject *self, TyObject *idobj) } static TyObject * -next_interpreter_id(TyObject *self, TyObject *Ty_UNUSED(ignored)) +next_interpreter_id(TyObject *self, TyObject *Py_UNUSED(ignored)) { int64_t interpid = _PyRuntime.interpreters.next_id; return TyLong_FromLongLong(interpid); } static TyObject * -unused_interpreter_id(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unused_interpreter_id(TyObject *self, TyObject *Py_UNUSED(ignored)) { int64_t interpid = INT64_MAX; assert(interpid > _PyRuntime.interpreters.next_id); @@ -1896,12 +1896,12 @@ interpreter_exists(TyObject *self, TyObject *idobj) if (interp == NULL) { if (TyErr_ExceptionMatches(TyExc_InterpreterNotFoundError)) { TyErr_Clear(); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } assert(TyErr_Occurred()); return NULL; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } static TyObject * @@ -1923,7 +1923,7 @@ link_interpreter_refcount(TyObject *self, TyObject *idobj) return NULL; } _TyInterpreterState_RequireIDRef(interp, 1); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1935,7 +1935,7 @@ unlink_interpreter_refcount(TyObject *self, TyObject *idobj) return NULL; } _TyInterpreterState_RequireIDRef(interp, 0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1946,9 +1946,9 @@ interpreter_refcount_linked(TyObject *self, TyObject *idobj) return NULL; } if (_TyInterpreterState_RequiresIDRef(interp)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } @@ -2124,7 +2124,7 @@ _testinternalcapi_test_long_numbits_impl(TyObject *module) return raiseTestError("test_long_numbits", "wrong result for TyLong_GetSign()"); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -2174,7 +2174,7 @@ get_rare_event_counters(TyObject *self, TyObject *type) } static TyObject * -reset_rare_event_counters(TyObject *self, TyObject *Ty_UNUSED(type)) +reset_rare_event_counters(TyObject *self, TyObject *Py_UNUSED(type)) { PyInterpreterState *interp = TyInterpreterState_Get(); @@ -2190,7 +2190,7 @@ reset_rare_event_counters(TyObject *self, TyObject *Ty_UNUSED(type)) #ifdef Ty_GIL_DISABLED static TyObject * -get_py_thread_id(TyObject *self, TyObject *Ty_UNUSED(ignored)) +get_py_thread_id(TyObject *self, TyObject *Py_UNUSED(ignored)) { uintptr_t tid = _Ty_ThreadId(); Ty_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(tid)); @@ -2212,7 +2212,7 @@ get_code(TyObject *obj) } static TyObject * -get_tlbc(TyObject *Ty_UNUSED(module), TyObject *obj) +get_tlbc(TyObject *Py_UNUSED(module), TyObject *obj) { PyCodeObject *code = get_code(obj); if (code == NULL) { @@ -2220,13 +2220,13 @@ get_tlbc(TyObject *Ty_UNUSED(module), TyObject *obj) } _Ty_CODEUNIT *bc = _TyCode_GetTLBCFast(TyThreadState_GET(), code); if (bc == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyBytes_FromStringAndSize((const char *)bc, _TyCode_NBYTES(code)); } static TyObject * -get_tlbc_id(TyObject *Ty_UNUSED(module), TyObject *obj) +get_tlbc_id(TyObject *Py_UNUSED(module), TyObject *obj) { PyCodeObject *code = get_code(obj); if (code == NULL) { @@ -2234,7 +2234,7 @@ get_tlbc_id(TyObject *Ty_UNUSED(module), TyObject *obj) } _Ty_CODEUNIT *bc = _TyCode_GetTLBCFast(TyThreadState_GET(), code); if (bc == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyLong_FromVoidPtr(bc); } @@ -2245,18 +2245,18 @@ has_inline_values(TyObject *self, TyObject *obj) { if ((Ty_TYPE(obj)->tp_flags & Ty_TPFLAGS_INLINE_VALUES) && _TyObject_InlineValues(obj)->valid) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * has_split_table(TyObject *self, TyObject *obj) { if (TyDict_Check(obj) && _TyDict_HasSplitTable((PyDictObject *)obj)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } // Circumvents standard version assignment machinery - use with caution and only on @@ -2271,7 +2271,7 @@ type_assign_specific_version_unsafe(TyObject *self, TyObject *args) } assert(!TyType_HasFeature(type, Ty_TPFLAGS_IMMUTABLETYPE)); _TyType_SetVersion(type, version); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2305,14 +2305,14 @@ get_next_dict_keys_version_impl(TyObject *module) } static TyObject * -get_static_builtin_types(TyObject *self, TyObject *Ty_UNUSED(ignored)) +get_static_builtin_types(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _PyStaticType_GetBuiltins(); } static TyObject * -identify_type_slot_wrappers(TyObject *self, TyObject *Ty_UNUSED(ignored)) +identify_type_slot_wrappers(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _TyType_GetSlotWrapperNames(); } @@ -2325,7 +2325,7 @@ has_deferred_refcount(TyObject *self, TyObject *op) } static TyObject * -get_tracked_heap_size(TyObject *self, TyObject *Ty_UNUSED(ignored)) +get_tracked_heap_size(TyObject *self, TyObject *Py_UNUSED(ignored)) { return TyLong_FromInt64(TyInterpreterState_Get()->gc.heap_size); } @@ -2334,16 +2334,16 @@ static TyObject * is_static_immortal(TyObject *self, TyObject *op) { if (_Ty_IsStaticImmortal(op)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * incref_decref_delayed(TyObject *self, TyObject *op) { _TyObject_XDecRefDelayed(Ty_NewRef(op)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef module_functions[] = { diff --git a/Modules/_testinternalcapi/complex.c b/Modules/_testinternalcapi/complex.c index a567793..2d25856 100644 --- a/Modules/_testinternalcapi/complex.c +++ b/Modules/_testinternalcapi/complex.c @@ -7,7 +7,7 @@ #define _PY_CR_FUNC2(suffix) \ static TyObject * \ - _py_cr_##suffix(TyObject *Ty_UNUSED(module), TyObject *args) \ + _py_cr_##suffix(TyObject *Py_UNUSED(module), TyObject *args) \ { \ Ty_complex a, res; \ double b; \ @@ -23,7 +23,7 @@ #define _PY_RC_FUNC2(suffix) \ static TyObject * \ - _py_rc_##suffix(TyObject *Ty_UNUSED(module), TyObject *args) \ + _py_rc_##suffix(TyObject *Py_UNUSED(module), TyObject *args) \ { \ Ty_complex b, res; \ double a; \ diff --git a/Modules/_testinternalcapi/set.c b/Modules/_testinternalcapi/set.c index 7863bcf..fc58ff1 100644 --- a/Modules/_testinternalcapi/set.c +++ b/Modules/_testinternalcapi/set.c @@ -42,7 +42,7 @@ set_next_entry(TyObject *self, TyObject *args) return NULL; } assert(rc == 0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testinternalcapi/test_critical_sections.c b/Modules/_testinternalcapi/test_critical_sections.c index 0e624db..ecf07fd 100644 --- a/Modules/_testinternalcapi/test_critical_sections.c +++ b/Modules/_testinternalcapi/test_critical_sections.c @@ -19,7 +19,7 @@ static TyObject * -test_critical_sections(TyObject *self, TyObject *Ty_UNUSED(args)) +test_critical_sections(TyObject *self, TyObject *Py_UNUSED(args)) { TyObject *d1 = TyDict_New(); assert(d1 != NULL); @@ -54,7 +54,7 @@ test_critical_sections(TyObject *self, TyObject *Ty_UNUSED(args)) Ty_DECREF(d2); Ty_DECREF(d1); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static void @@ -81,7 +81,7 @@ lock_unlock_two_objects(TyObject *a, TyObject *b, int recurse_depth) // Test that nested critical sections do not deadlock if they attempt to lock // the same object. static TyObject * -test_critical_sections_nest(TyObject *self, TyObject *Ty_UNUSED(args)) +test_critical_sections_nest(TyObject *self, TyObject *Py_UNUSED(args)) { TyObject *a = TyDict_New(); assert(a != NULL); @@ -106,13 +106,13 @@ test_critical_sections_nest(TyObject *self, TyObject *Ty_UNUSED(args)) Ty_DECREF(b); Ty_DECREF(a); - Ty_RETURN_NONE; + Py_RETURN_NONE; } // Test that a critical section is suspended by a Ty_BEGIN_ALLOW_THREADS and // resumed by a Ty_END_ALLOW_THREADS. static TyObject * -test_critical_sections_suspend(TyObject *self, TyObject *Ty_UNUSED(args)) +test_critical_sections_suspend(TyObject *self, TyObject *Py_UNUSED(args)) { TyObject *a = TyDict_New(); assert(a != NULL); @@ -130,7 +130,7 @@ test_critical_sections_suspend(TyObject *self, TyObject *Ty_UNUSED(args)) Ty_END_CRITICAL_SECTION(); Ty_DECREF(a); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef Ty_CAN_START_THREADS @@ -175,7 +175,7 @@ thread_critical_sections(void *arg) } static TyObject * -test_critical_sections_threads(TyObject *self, TyObject *Ty_UNUSED(args)) +test_critical_sections_threads(TyObject *self, TyObject *Py_UNUSED(args)) { const Ty_ssize_t NUM_THREADS = 4; struct test_data test_data = { @@ -196,7 +196,7 @@ test_critical_sections_threads(TyObject *self, TyObject *Ty_UNUSED(args)) Ty_DECREF(test_data.obj3); Ty_DECREF(test_data.obj2); Ty_DECREF(test_data.obj1); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static void @@ -263,7 +263,7 @@ thread_gc(void *arg) } static TyObject * -test_critical_sections_gc(TyObject *self, TyObject *Ty_UNUSED(args)) +test_critical_sections_gc(TyObject *self, TyObject *Py_UNUSED(args)) { // gh-118332: Contended critical sections should not deadlock with GC const Ty_ssize_t NUM_THREADS = 3; @@ -279,7 +279,7 @@ test_critical_sections_gc(TyObject *self, TyObject *Ty_UNUSED(args)) } PyEvent_Wait(&test_data.done_event); Ty_DECREF(test_data.obj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif diff --git a/Modules/_testinternalcapi/test_lock.c b/Modules/_testinternalcapi/test_lock.c index 030dd48..9af00f2 100644 --- a/Modules/_testinternalcapi/test_lock.c +++ b/Modules/_testinternalcapi/test_lock.c @@ -40,7 +40,7 @@ test_lock_basic(TyObject *self, TyObject *obj) PyMutex_Unlock(&m); assert(m._bits == 0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } struct test_lock2_data { @@ -97,7 +97,7 @@ test_lock_two_threads(TyObject *self, TyObject *obj) PyEvent_Wait(&test_data.done); assert(test_data.m._bits == 0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #define COUNTER_THREADS 5 @@ -147,7 +147,7 @@ test_lock_counter(TyObject *self, TyObject *obj) } assert(test_data.counter == COUNTER_THREADS * COUNTER_ITERS); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #define SLOW_COUNTER_ITERS 100 @@ -190,7 +190,7 @@ test_lock_counter_slow(TyObject *self, TyObject *obj) } assert(test_data.counter == COUNTER_THREADS * SLOW_COUNTER_ITERS); - Ty_RETURN_NONE; + Py_RETURN_NONE; } struct bench_data_locks { @@ -348,7 +348,7 @@ test_lock_benchmark(TyObject *module, TyObject *obj) return NULL; } Ty_DECREF(res); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -379,7 +379,7 @@ test_lock_once(TyObject *self, TyObject *obj) assert(counter == 5); } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } struct test_rwlock_data { @@ -477,7 +477,7 @@ test_lock_rwlock(TyObject *self, TyObject *obj) assert(test_data.rw.bits == 0); PyEvent_Wait(&test_data.done); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -500,7 +500,7 @@ test_lock_recursive(TyObject *self, TyObject *obj) assert(!PyMutex_IsLocked(&m.mutex)); assert(m.level == 0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef test_methods[] = { diff --git a/Modules/_testlimitedcapi/bytearray.c b/Modules/_testlimitedcapi/bytearray.c index a43e1d6..cfe1d3f 100644 --- a/Modules/_testlimitedcapi/bytearray.c +++ b/Modules/_testlimitedcapi/bytearray.c @@ -4,7 +4,7 @@ /* Test TyByteArray_Check() */ static TyObject * -bytearray_check(TyObject *Ty_UNUSED(module), TyObject *obj) +bytearray_check(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyByteArray_Check(obj)); @@ -12,7 +12,7 @@ bytearray_check(TyObject *Ty_UNUSED(module), TyObject *obj) /* Test TyByteArray_CheckExact() */ static TyObject * -bytearray_checkexact(TyObject *Ty_UNUSED(module), TyObject *obj) +bytearray_checkexact(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyByteArray_CheckExact(obj)); @@ -20,7 +20,7 @@ bytearray_checkexact(TyObject *Ty_UNUSED(module), TyObject *obj) /* Test TyByteArray_FromStringAndSize() */ static TyObject * -bytearray_fromstringandsize(TyObject *Ty_UNUSED(module), TyObject *args) +bytearray_fromstringandsize(TyObject *Py_UNUSED(module), TyObject *args) { const char *s; Ty_ssize_t bsize; @@ -38,7 +38,7 @@ bytearray_fromstringandsize(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyByteArray_FromObject() */ static TyObject * -bytearray_fromobject(TyObject *Ty_UNUSED(module), TyObject *arg) +bytearray_fromobject(TyObject *Py_UNUSED(module), TyObject *arg) { NULLABLE(arg); return TyByteArray_FromObject(arg); @@ -46,7 +46,7 @@ bytearray_fromobject(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test TyByteArray_Size() */ static TyObject * -bytearray_size(TyObject *Ty_UNUSED(module), TyObject *arg) +bytearray_size(TyObject *Py_UNUSED(module), TyObject *arg) { NULLABLE(arg); RETURN_SIZE(TyByteArray_Size(arg)); @@ -54,7 +54,7 @@ bytearray_size(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test TyUnicode_AsString() */ static TyObject * -bytearray_asstring(TyObject *Ty_UNUSED(module), TyObject *args) +bytearray_asstring(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t buflen; @@ -73,7 +73,7 @@ bytearray_asstring(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyByteArray_Concat() */ static TyObject * -bytearray_concat(TyObject *Ty_UNUSED(module), TyObject *args) +bytearray_concat(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *left, *right; @@ -87,7 +87,7 @@ bytearray_concat(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyByteArray_Resize() */ static TyObject * -bytearray_resize(TyObject *Ty_UNUSED(module), TyObject *args) +bytearray_resize(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t size; diff --git a/Modules/_testlimitedcapi/bytes.c b/Modules/_testlimitedcapi/bytes.c index e7ddd64..e1b6f94 100644 --- a/Modules/_testlimitedcapi/bytes.c +++ b/Modules/_testlimitedcapi/bytes.c @@ -4,7 +4,7 @@ /* Test TyBytes_Check() */ static TyObject * -bytes_check(TyObject *Ty_UNUSED(module), TyObject *obj) +bytes_check(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyBytes_Check(obj)); @@ -12,7 +12,7 @@ bytes_check(TyObject *Ty_UNUSED(module), TyObject *obj) /* Test TyBytes_CheckExact() */ static TyObject * -bytes_checkexact(TyObject *Ty_UNUSED(module), TyObject *obj) +bytes_checkexact(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyBytes_CheckExact(obj)); @@ -20,7 +20,7 @@ bytes_checkexact(TyObject *Ty_UNUSED(module), TyObject *obj) /* Test TyBytes_FromStringAndSize() */ static TyObject * -bytes_fromstringandsize(TyObject *Ty_UNUSED(module), TyObject *args) +bytes_fromstringandsize(TyObject *Py_UNUSED(module), TyObject *args) { const char *s; Ty_ssize_t bsize; @@ -38,7 +38,7 @@ bytes_fromstringandsize(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyBytes_FromString() */ static TyObject * -bytes_fromstring(TyObject *Ty_UNUSED(module), TyObject *arg) +bytes_fromstring(TyObject *Py_UNUSED(module), TyObject *arg) { const char *s; Ty_ssize_t size; @@ -51,7 +51,7 @@ bytes_fromstring(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test TyBytes_FromObject() */ static TyObject * -bytes_fromobject(TyObject *Ty_UNUSED(module), TyObject *arg) +bytes_fromobject(TyObject *Py_UNUSED(module), TyObject *arg) { NULLABLE(arg); return TyBytes_FromObject(arg); @@ -59,7 +59,7 @@ bytes_fromobject(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test TyBytes_Size() */ static TyObject * -bytes_size(TyObject *Ty_UNUSED(module), TyObject *arg) +bytes_size(TyObject *Py_UNUSED(module), TyObject *arg) { NULLABLE(arg); RETURN_SIZE(TyBytes_Size(arg)); @@ -67,7 +67,7 @@ bytes_size(TyObject *Ty_UNUSED(module), TyObject *arg) /* Test TyUnicode_AsString() */ static TyObject * -bytes_asstring(TyObject *Ty_UNUSED(module), TyObject *args) +bytes_asstring(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t buflen; @@ -86,7 +86,7 @@ bytes_asstring(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyBytes_AsStringAndSize() */ static TyObject * -bytes_asstringandsize(TyObject *Ty_UNUSED(module), TyObject *args) +bytes_asstringandsize(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t buflen; @@ -110,7 +110,7 @@ bytes_asstringandsize(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -bytes_asstringandsize_null(TyObject *Ty_UNUSED(module), TyObject *args) +bytes_asstringandsize_null(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t buflen; @@ -125,7 +125,7 @@ bytes_asstringandsize_null(TyObject *Ty_UNUSED(module), TyObject *args) } if (s == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } else { return TyBytes_FromStringAndSize(s, buflen); @@ -134,7 +134,7 @@ bytes_asstringandsize_null(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyBytes_Repr() */ static TyObject * -bytes_repr(TyObject *Ty_UNUSED(module), TyObject *args) +bytes_repr(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; int smartquotes; @@ -147,7 +147,7 @@ bytes_repr(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyBytes_Concat() */ static TyObject * -bytes_concat(TyObject *Ty_UNUSED(module), TyObject *args) +bytes_concat(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *left, *right; int new = 0; @@ -171,14 +171,14 @@ bytes_concat(TyObject *Ty_UNUSED(module), TyObject *args) } TyBytes_Concat(&left, right); if (left == NULL && !TyErr_Occurred()) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return left; } /* Test TyBytes_ConcatAndDel() */ static TyObject * -bytes_concatanddel(TyObject *Ty_UNUSED(module), TyObject *args) +bytes_concatanddel(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *left, *right; int new = 0; @@ -203,14 +203,14 @@ bytes_concatanddel(TyObject *Ty_UNUSED(module), TyObject *args) Ty_XINCREF(right); TyBytes_ConcatAndDel(&left, right); if (left == NULL && !TyErr_Occurred()) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return left; } /* Test TyBytes_DecodeEscape() */ static TyObject * -bytes_decodeescape(TyObject *Ty_UNUSED(module), TyObject *args) +bytes_decodeescape(TyObject *Py_UNUSED(module), TyObject *args) { const char *s; Ty_ssize_t bsize; diff --git a/Modules/_testlimitedcapi/clinic/long.c.h b/Modules/_testlimitedcapi/clinic/long.c.h index f22795c..1e6acc4 100644 --- a/Modules/_testlimitedcapi/clinic/long.c.h +++ b/Modules/_testlimitedcapi/clinic/long.c.h @@ -14,7 +14,7 @@ static TyObject * _testlimitedcapi_test_long_api_impl(TyObject *module); static TyObject * -_testlimitedcapi_test_long_api(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testlimitedcapi_test_long_api(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testlimitedcapi_test_long_api_impl(module); } @@ -31,7 +31,7 @@ static TyObject * _testlimitedcapi_test_longlong_api_impl(TyObject *module); static TyObject * -_testlimitedcapi_test_longlong_api(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testlimitedcapi_test_longlong_api(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testlimitedcapi_test_longlong_api_impl(module); } @@ -52,7 +52,7 @@ static TyObject * _testlimitedcapi_test_long_and_overflow_impl(TyObject *module); static TyObject * -_testlimitedcapi_test_long_and_overflow(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testlimitedcapi_test_long_and_overflow(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testlimitedcapi_test_long_and_overflow_impl(module); } @@ -73,7 +73,7 @@ static TyObject * _testlimitedcapi_test_long_long_and_overflow_impl(TyObject *module); static TyObject * -_testlimitedcapi_test_long_long_and_overflow(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testlimitedcapi_test_long_long_and_overflow(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testlimitedcapi_test_long_long_and_overflow_impl(module); } @@ -94,7 +94,7 @@ static TyObject * _testlimitedcapi_test_long_as_size_t_impl(TyObject *module); static TyObject * -_testlimitedcapi_test_long_as_size_t(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testlimitedcapi_test_long_as_size_t(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testlimitedcapi_test_long_as_size_t_impl(module); } @@ -111,7 +111,7 @@ static TyObject * _testlimitedcapi_test_long_as_unsigned_long_long_mask_impl(TyObject *module); static TyObject * -_testlimitedcapi_test_long_as_unsigned_long_long_mask(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testlimitedcapi_test_long_as_unsigned_long_long_mask(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testlimitedcapi_test_long_as_unsigned_long_long_mask_impl(module); } @@ -128,7 +128,7 @@ static TyObject * _testlimitedcapi_test_long_as_double_impl(TyObject *module); static TyObject * -_testlimitedcapi_test_long_as_double(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testlimitedcapi_test_long_as_double(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testlimitedcapi_test_long_as_double_impl(module); } diff --git a/Modules/_testlimitedcapi/codec.c b/Modules/_testlimitedcapi/codec.c index 91903fd..5c7b397 100644 --- a/Modules/_testlimitedcapi/codec.c +++ b/Modules/_testlimitedcapi/codec.c @@ -8,7 +8,7 @@ #include "parts.h" static TyObject * -codec_namereplace_errors(TyObject *Ty_UNUSED(module), TyObject *exc) +codec_namereplace_errors(TyObject *Py_UNUSED(module), TyObject *exc) { assert(exc != NULL); return PyCodec_NameReplaceErrors(exc); diff --git a/Modules/_testlimitedcapi/complex.c b/Modules/_testlimitedcapi/complex.c index 4fac597..0e6d62d 100644 --- a/Modules/_testlimitedcapi/complex.c +++ b/Modules/_testlimitedcapi/complex.c @@ -3,21 +3,21 @@ static TyObject * -complex_check(TyObject *Ty_UNUSED(module), TyObject *obj) +complex_check(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyComplex_Check(obj)); } static TyObject * -complex_checkexact(TyObject *Ty_UNUSED(module), TyObject *obj) +complex_checkexact(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyComplex_CheckExact(obj)); } static TyObject * -complex_fromdoubles(TyObject *Ty_UNUSED(module), TyObject *args) +complex_fromdoubles(TyObject *Py_UNUSED(module), TyObject *args) { double real, imag; @@ -29,7 +29,7 @@ complex_fromdoubles(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -complex_realasdouble(TyObject *Ty_UNUSED(module), TyObject *obj) +complex_realasdouble(TyObject *Py_UNUSED(module), TyObject *obj) { double real; @@ -44,7 +44,7 @@ complex_realasdouble(TyObject *Ty_UNUSED(module), TyObject *obj) } static TyObject * -complex_imagasdouble(TyObject *Ty_UNUSED(module), TyObject *obj) +complex_imagasdouble(TyObject *Py_UNUSED(module), TyObject *obj) { double imag; diff --git a/Modules/_testlimitedcapi/eval.c b/Modules/_testlimitedcapi/eval.c index 524b577..431e8c1 100644 --- a/Modules/_testlimitedcapi/eval.c +++ b/Modules/_testlimitedcapi/eval.c @@ -14,49 +14,49 @@ eval_get_func_desc(TyObject *self, TyObject *func) } static TyObject * -eval_getlocals(TyObject *module, TyObject *Ty_UNUSED(args)) +eval_getlocals(TyObject *module, TyObject *Py_UNUSED(args)) { return Ty_XNewRef(TyEval_GetLocals()); } static TyObject * -eval_getglobals(TyObject *module, TyObject *Ty_UNUSED(args)) +eval_getglobals(TyObject *module, TyObject *Py_UNUSED(args)) { return Ty_XNewRef(TyEval_GetGlobals()); } static TyObject * -eval_getbuiltins(TyObject *module, TyObject *Ty_UNUSED(args)) +eval_getbuiltins(TyObject *module, TyObject *Py_UNUSED(args)) { return Ty_XNewRef(TyEval_GetBuiltins()); } static TyObject * -eval_getframe(TyObject *module, TyObject *Ty_UNUSED(args)) +eval_getframe(TyObject *module, TyObject *Py_UNUSED(args)) { return Ty_XNewRef(TyEval_GetFrame()); } static TyObject * -eval_getframe_builtins(TyObject *module, TyObject *Ty_UNUSED(args)) +eval_getframe_builtins(TyObject *module, TyObject *Py_UNUSED(args)) { return TyEval_GetFrameBuiltins(); } static TyObject * -eval_getframe_globals(TyObject *module, TyObject *Ty_UNUSED(args)) +eval_getframe_globals(TyObject *module, TyObject *Py_UNUSED(args)) { return TyEval_GetFrameGlobals(); } static TyObject * -eval_getframe_locals(TyObject *module, TyObject *Ty_UNUSED(args)) +eval_getframe_locals(TyObject *module, TyObject *Py_UNUSED(args)) { return TyEval_GetFrameLocals(); } static TyObject * -eval_get_recursion_limit(TyObject *module, TyObject *Ty_UNUSED(args)) +eval_get_recursion_limit(TyObject *module, TyObject *Py_UNUSED(args)) { int limit = Ty_GetRecursionLimit(); return TyLong_FromLong(limit); @@ -70,7 +70,7 @@ eval_set_recursion_limit(TyObject *module, TyObject *args) return NULL; } Ty_SetRecursionLimit(limit); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef test_methods[] = { diff --git a/Modules/_testlimitedcapi/float.c b/Modules/_testlimitedcapi/float.c index a86cc89..4415ffa 100644 --- a/Modules/_testlimitedcapi/float.c +++ b/Modules/_testlimitedcapi/float.c @@ -3,28 +3,28 @@ static TyObject * -float_check(TyObject *Ty_UNUSED(module), TyObject *obj) +float_check(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyFloat_Check(obj)); } static TyObject * -float_checkexact(TyObject *Ty_UNUSED(module), TyObject *obj) +float_checkexact(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyFloat_CheckExact(obj)); } static TyObject * -float_fromstring(TyObject *Ty_UNUSED(module), TyObject *obj) +float_fromstring(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyFloat_FromString(obj); } static TyObject * -float_fromdouble(TyObject *Ty_UNUSED(module), TyObject *obj) +float_fromdouble(TyObject *Py_UNUSED(module), TyObject *obj) { double d; @@ -36,7 +36,7 @@ float_fromdouble(TyObject *Ty_UNUSED(module), TyObject *obj) } static TyObject * -float_asdouble(TyObject *Ty_UNUSED(module), TyObject *obj) +float_asdouble(TyObject *Py_UNUSED(module), TyObject *obj) { double d; @@ -50,19 +50,19 @@ float_asdouble(TyObject *Ty_UNUSED(module), TyObject *obj) } static TyObject * -float_getinfo(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(arg)) +float_getinfo(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(arg)) { return TyFloat_GetInfo(); } static TyObject * -float_getmax(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(arg)) +float_getmax(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(arg)) { return TyFloat_FromDouble(TyFloat_GetMax()); } static TyObject * -float_getmin(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(arg)) +float_getmin(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(arg)) { return TyFloat_FromDouble(TyFloat_GetMin()); } diff --git a/Modules/_testlimitedcapi/heaptype_relative.c b/Modules/_testlimitedcapi/heaptype_relative.c index 9cee6b7..b36ab32 100644 --- a/Modules/_testlimitedcapi/heaptype_relative.c +++ b/Modules/_testlimitedcapi/heaptype_relative.c @@ -88,7 +88,7 @@ var_heaptype_set_data_to_3s( return NULL; } memset(data_ptr, 3, data_size); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -207,7 +207,7 @@ heaptype_with_member_extract_and_check_memb(TyObject *self) } static TyObject * -heaptype_with_member_get_memb(TyObject *self, TyObject *Ty_UNUSED(ignored)) +heaptype_with_member_get_memb(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyMemberDef *def = heaptype_with_member_extract_and_check_memb(self); return PyMember_GetOne((const char *)self, def); @@ -221,18 +221,18 @@ heaptype_with_member_set_memb(TyObject *self, TyObject *value) if (r < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -get_memb_offset(TyObject *self, TyObject *Ty_UNUSED(ignored)) +get_memb_offset(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyMemberDef *def = heaptype_with_member_extract_and_check_memb(self); return TyLong_FromSsize_t(def->offset); } static TyObject * -heaptype_with_member_get_memb_relative(TyObject *self, TyObject *Ty_UNUSED(ignored)) +heaptype_with_member_get_memb_relative(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyMemberDef def = {"memb", Ty_T_BYTE, sizeof(TyObject), Ty_RELATIVE_OFFSET}; return PyMember_GetOne((const char *)self, &def); @@ -246,7 +246,7 @@ heaptype_with_member_set_memb_relative(TyObject *self, TyObject *value) if (r < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } typedef struct { @@ -280,7 +280,7 @@ static TyType_Spec HeapCTypeWithRelativeDict_spec = { Ty_RELATIVE_OFFSET}, {"__dictoffset__", Ty_T_PYSSIZET, offsetof(HeapCTypeWithDictStruct, dict), - Ty_READONLY | Ty_RELATIVE_OFFSET}, + Py_READONLY | Ty_RELATIVE_OFFSET}, {NULL} /* Sentinel */ }}, {0, 0}, @@ -317,7 +317,7 @@ static TyType_Spec HeapCTypeWithRelativeWeakref_spec = { Ty_RELATIVE_OFFSET}, {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(HeapCTypeWithWeakrefStruct, weakreflist), - Ty_READONLY | Ty_RELATIVE_OFFSET}, + Py_READONLY | Ty_RELATIVE_OFFSET}, {NULL} /* Sentinel */ }}, {0, 0}, @@ -395,7 +395,7 @@ make_heaptype_with_member_impl(TyObject *module, int extra_base_size, static TyObject * -test_alignof_max_align_t(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_alignof_max_align_t(TyObject *module, TyObject *Py_UNUSED(ignored)) { // We define ALIGNOF_MAX_ALIGN_T even if the compiler doesn't support // max_align_t. Double-check that it's correct. @@ -408,7 +408,7 @@ test_alignof_max_align_t(TyObject *module, TyObject *Ty_UNUSED(ignored)) // Ensure it's a power of two assert((ALIGNOF_MAX_ALIGN_T & (ALIGNOF_MAX_ALIGN_T - 1)) == 0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef TestMethods[] = { @@ -464,7 +464,7 @@ _PyTestLimitedCAPI_Init_HeaptypeRelative(TyObject *m) if (TyModule_AddIntMacro(m, Ty_T_PYSSIZET) < 0) { return -1; } - if (TyModule_AddIntMacro(m, Ty_READONLY) < 0) { + if (TyModule_AddIntMacro(m, Py_READONLY) < 0) { return -1; } diff --git a/Modules/_testlimitedcapi/import.c b/Modules/_testlimitedcapi/import.c index 6b6d48c..62d558f 100644 --- a/Modules/_testlimitedcapi/import.c +++ b/Modules/_testlimitedcapi/import.c @@ -10,7 +10,7 @@ /* Test TyImport_GetMagicNumber() */ static TyObject * -pyimport_getmagicnumber(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) +pyimport_getmagicnumber(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(args)) { long magic = TyImport_GetMagicNumber(); return TyLong_FromLong(magic); @@ -19,7 +19,7 @@ pyimport_getmagicnumber(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) /* Test TyImport_GetMagicTag() */ static TyObject * -pyimport_getmagictag(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) +pyimport_getmagictag(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(args)) { const char *tag = TyImport_GetMagicTag(); return TyUnicode_FromString(tag); @@ -28,7 +28,7 @@ pyimport_getmagictag(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) /* Test TyImport_GetModuleDict() */ static TyObject * -pyimport_getmoduledict(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) +pyimport_getmoduledict(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(args)) { return Ty_XNewRef(TyImport_GetModuleDict()); } @@ -36,7 +36,7 @@ pyimport_getmoduledict(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) /* Test TyImport_GetModule() */ static TyObject * -pyimport_getmodule(TyObject *Ty_UNUSED(module), TyObject *name) +pyimport_getmodule(TyObject *Py_UNUSED(module), TyObject *name) { assert(!TyErr_Occurred()); NULLABLE(name); @@ -50,7 +50,7 @@ pyimport_getmodule(TyObject *Ty_UNUSED(module), TyObject *name) /* Test TyImport_AddModuleObject() */ static TyObject * -pyimport_addmoduleobject(TyObject *Ty_UNUSED(module), TyObject *name) +pyimport_addmoduleobject(TyObject *Py_UNUSED(module), TyObject *name) { NULLABLE(name); return Ty_XNewRef(TyImport_AddModuleObject(name)); @@ -59,7 +59,7 @@ pyimport_addmoduleobject(TyObject *Ty_UNUSED(module), TyObject *name) /* Test TyImport_AddModule() */ static TyObject * -pyimport_addmodule(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_addmodule(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -73,7 +73,7 @@ pyimport_addmodule(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_AddModuleRef() */ static TyObject * -pyimport_addmoduleref(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_addmoduleref(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -87,7 +87,7 @@ pyimport_addmoduleref(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_Import() */ static TyObject * -pyimport_import(TyObject *Ty_UNUSED(module), TyObject *name) +pyimport_import(TyObject *Py_UNUSED(module), TyObject *name) { NULLABLE(name); return TyImport_Import(name); @@ -96,7 +96,7 @@ pyimport_import(TyObject *Ty_UNUSED(module), TyObject *name) /* Test TyImport_ImportModule() */ static TyObject * -pyimport_importmodule(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_importmodule(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -110,7 +110,7 @@ pyimport_importmodule(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_ImportModuleNoBlock() */ static TyObject * -pyimport_importmodulenoblock(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_importmodulenoblock(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -127,7 +127,7 @@ pyimport_importmodulenoblock(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_ImportModuleEx() */ static TyObject * -pyimport_importmoduleex(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_importmoduleex(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -146,7 +146,7 @@ pyimport_importmoduleex(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_ImportModuleLevel() */ static TyObject * -pyimport_importmodulelevel(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_importmodulelevel(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -166,7 +166,7 @@ pyimport_importmodulelevel(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_ImportModuleLevelObject() */ static TyObject * -pyimport_importmodulelevelobject(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_importmodulelevelobject(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *name, *globals, *locals, *fromlist; int level; @@ -185,7 +185,7 @@ pyimport_importmodulelevelobject(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_ImportFrozenModule() */ static TyObject * -pyimport_importfrozenmodule(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_importfrozenmodule(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -199,7 +199,7 @@ pyimport_importfrozenmodule(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_ImportFrozenModuleObject() */ static TyObject * -pyimport_importfrozenmoduleobject(TyObject *Ty_UNUSED(module), TyObject *name) +pyimport_importfrozenmoduleobject(TyObject *Py_UNUSED(module), TyObject *name) { NULLABLE(name); RETURN_INT(TyImport_ImportFrozenModuleObject(name)); @@ -208,7 +208,7 @@ pyimport_importfrozenmoduleobject(TyObject *Ty_UNUSED(module), TyObject *name) /* Test TyImport_ExecCodeModule() */ static TyObject * -pyimport_executecodemodule(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_executecodemodule(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -224,7 +224,7 @@ pyimport_executecodemodule(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_ExecCodeModuleEx() */ static TyObject * -pyimport_executecodemoduleex(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_executecodemoduleex(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -241,7 +241,7 @@ pyimport_executecodemoduleex(TyObject *Ty_UNUSED(module), TyObject *args) /* Test TyImport_ExecCodeModuleWithPathnames() */ static TyObject * -pyimport_executecodemodulewithpathnames(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_executecodemodulewithpathnames(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -260,7 +260,7 @@ pyimport_executecodemodulewithpathnames(TyObject *Ty_UNUSED(module), TyObject *a /* Test TyImport_ExecCodeModuleObject() */ static TyObject * -pyimport_executecodemoduleobject(TyObject *Ty_UNUSED(module), TyObject *args) +pyimport_executecodemoduleobject(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *name, *code, *pathname, *cpathname; if (!TyArg_ParseTuple(args, "OOOO", &name, &code, &pathname, &cpathname)) { diff --git a/Modules/_testlimitedcapi/list.c b/Modules/_testlimitedcapi/list.c index a06d1cb..4cbd35f 100644 --- a/Modules/_testlimitedcapi/list.c +++ b/Modules/_testlimitedcapi/list.c @@ -8,34 +8,34 @@ #include "util.h" static TyObject * -list_check(TyObject* Ty_UNUSED(module), TyObject *obj) +list_check(TyObject* Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyList_Check(obj)); } static TyObject * -list_check_exact(TyObject* Ty_UNUSED(module), TyObject *obj) +list_check_exact(TyObject* Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyList_CheckExact(obj)); } static TyObject * -list_new(TyObject* Ty_UNUSED(module), TyObject *obj) +list_new(TyObject* Py_UNUSED(module), TyObject *obj) { return TyList_New(TyLong_AsSsize_t(obj)); } static TyObject * -list_size(TyObject *Ty_UNUSED(module), TyObject *obj) +list_size(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); RETURN_SIZE(TyList_Size(obj)); } static TyObject * -list_getitem(TyObject *Ty_UNUSED(module), TyObject *args) +list_getitem(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t i; @@ -47,7 +47,7 @@ list_getitem(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -list_get_item_ref(TyObject *Ty_UNUSED(module), TyObject *args) +list_get_item_ref(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t i; @@ -59,7 +59,7 @@ list_get_item_ref(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -list_setitem(TyObject *Ty_UNUSED(module), TyObject *args) +list_setitem(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj, *value; Ty_ssize_t i; @@ -73,7 +73,7 @@ list_setitem(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -list_insert(TyObject *Ty_UNUSED(module), TyObject *args) +list_insert(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj, *value; Ty_ssize_t where; @@ -87,7 +87,7 @@ list_insert(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -list_append(TyObject *Ty_UNUSED(module), TyObject *args) +list_append(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj, *value; if (!TyArg_ParseTuple(args, "OO", &obj, &value)) { @@ -99,7 +99,7 @@ list_append(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -list_getslice(TyObject *Ty_UNUSED(module), TyObject *args) +list_getslice(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t ilow, ihigh; @@ -112,7 +112,7 @@ list_getslice(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -list_setslice(TyObject *Ty_UNUSED(module), TyObject *args) +list_setslice(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj, *value; Ty_ssize_t ilow, ihigh; @@ -125,21 +125,21 @@ list_setslice(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -list_sort(TyObject* Ty_UNUSED(module), TyObject *obj) +list_sort(TyObject* Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); RETURN_INT(TyList_Sort(obj)); } static TyObject * -list_reverse(TyObject* Ty_UNUSED(module), TyObject *obj) +list_reverse(TyObject* Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); RETURN_INT(TyList_Reverse(obj)); } static TyObject * -list_astuple(TyObject* Ty_UNUSED(module), TyObject *obj) +list_astuple(TyObject* Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyList_AsTuple(obj); diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c index 2a228d2..9b0a0fc 100644 --- a/Modules/_testlimitedcapi/long.c +++ b/Modules/_testlimitedcapi/long.c @@ -276,7 +276,7 @@ _testlimitedcapi_test_long_and_overflow_impl(TyObject *module) return raiseTestError("test_long_and_overflow", "overflow was not cleared"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -443,7 +443,7 @@ _testlimitedcapi_test_long_long_and_overflow_impl(TyObject *module) return raiseTestError("test_long_long_and_overflow", "overflow was not cleared"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -509,7 +509,7 @@ _testlimitedcapi_test_long_as_unsigned_long_long_mask_impl(TyObject *module) "something other than SystemError"); } TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -741,7 +741,7 @@ pylong_asvoidptr(TyObject *module, TyObject *arg) if (TyErr_Occurred()) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef((TyObject *)value); } diff --git a/Modules/_testlimitedcapi/object.c b/Modules/_testlimitedcapi/object.c index 50f8df2..60036b0 100644 --- a/Modules/_testlimitedcapi/object.c +++ b/Modules/_testlimitedcapi/object.c @@ -10,7 +10,7 @@ /* Test Ty_GetConstant() */ static TyObject * -get_constant(TyObject *Ty_UNUSED(module), TyObject *args) +get_constant(TyObject *Py_UNUSED(module), TyObject *args) { int constant_id; if (!TyArg_ParseTuple(args, "i", &constant_id)) { @@ -28,7 +28,7 @@ get_constant(TyObject *Ty_UNUSED(module), TyObject *args) /* Test Ty_GetConstantBorrowed() */ static TyObject * -get_constant_borrowed(TyObject *Ty_UNUSED(module), TyObject *args) +get_constant_borrowed(TyObject *Py_UNUSED(module), TyObject *args) { int constant_id; if (!TyArg_ParseTuple(args, "i", &constant_id)) { @@ -46,7 +46,7 @@ get_constant_borrowed(TyObject *Ty_UNUSED(module), TyObject *args) /* Test constants */ static TyObject * -test_constants(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) +test_constants(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(args)) { // Test that implementation of constants in the limited C API: // check that the C code compiles. @@ -59,7 +59,7 @@ test_constants(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(args)) assert(Ty_Ellipsis == Ty_GetConstant(Ty_CONSTANT_ELLIPSIS)); assert(Ty_NotImplemented == Ty_GetConstant(Ty_CONSTANT_NOT_IMPLEMENTED)); // Other constants are tested in test_capi.test_object - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef test_methods[] = { diff --git a/Modules/_testlimitedcapi/pyos.c b/Modules/_testlimitedcapi/pyos.c index 220c0a8..dcdbab6 100644 --- a/Modules/_testlimitedcapi/pyos.c +++ b/Modules/_testlimitedcapi/pyos.c @@ -2,7 +2,7 @@ static TyObject * -test_PyOS_mystrnicmp(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_PyOS_mystrnicmp(TyObject *self, TyObject *Py_UNUSED(ignored)) { assert(TyOS_mystrnicmp("", "", 0) == 0); assert(TyOS_mystrnicmp("", "", 1) == 0); @@ -23,11 +23,11 @@ test_PyOS_mystrnicmp(TyObject *self, TyObject *Ty_UNUSED(ignored)) // GH-21845 assert(TyOS_mystrnicmp("insert\0a", "insert\0b", 8) == 0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_PyOS_mystricmp(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_PyOS_mystricmp(TyObject *self, TyObject *Py_UNUSED(ignored)) { assert(TyOS_mystricmp("", "") == 0); assert(TyOS_mystricmp("insert", "insert") == 0); @@ -40,7 +40,7 @@ test_PyOS_mystricmp(TyObject *self, TyObject *Ty_UNUSED(ignored)) assert(TyOS_mystricmp("insert", "ins\0rt") == 'e'); assert(TyOS_mystricmp("invert", "insert") == ('v' - 's')); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef test_methods[] = { diff --git a/Modules/_testlimitedcapi/set.c b/Modules/_testlimitedcapi/set.c index 353e077..d587ee7 100644 --- a/Modules/_testlimitedcapi/set.c +++ b/Modules/_testlimitedcapi/set.c @@ -121,7 +121,7 @@ set_clear(TyObject *self, TyObject *obj) } static TyObject * -test_frozenset_add_in_capi(TyObject *self, TyObject *Ty_UNUSED(obj)) +test_frozenset_add_in_capi(TyObject *self, TyObject *Py_UNUSED(obj)) { // Test that `frozenset` can be used with `TySet_Add`, // when frozenset is just created in CAPI. @@ -145,7 +145,7 @@ test_frozenset_add_in_capi(TyObject *self, TyObject *Ty_UNUSED(obj)) } Ty_DECREF(fs); Ty_DECREF(num); - Ty_RETURN_NONE; + Py_RETURN_NONE; unexpected: TyErr_SetString(TyExc_ValueError, "set does not contain expected value"); diff --git a/Modules/_testlimitedcapi/sys.c b/Modules/_testlimitedcapi/sys.c index 6442f18..66fda8a 100644 --- a/Modules/_testlimitedcapi/sys.c +++ b/Modules/_testlimitedcapi/sys.c @@ -3,7 +3,7 @@ static TyObject * -sys_getobject(TyObject *Ty_UNUSED(module), TyObject *arg) +sys_getobject(TyObject *Py_UNUSED(module), TyObject *arg) { const char *name; Ty_ssize_t size; @@ -18,7 +18,7 @@ sys_getobject(TyObject *Ty_UNUSED(module), TyObject *arg) } static TyObject * -sys_setobject(TyObject *Ty_UNUSED(module), TyObject *args) +sys_setobject(TyObject *Py_UNUSED(module), TyObject *args) { const char *name; Ty_ssize_t size; @@ -31,7 +31,7 @@ sys_setobject(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -sys_getxoptions(TyObject *Ty_UNUSED(module), TyObject *Ty_UNUSED(ignored)) +sys_getxoptions(TyObject *Py_UNUSED(module), TyObject *Py_UNUSED(ignored)) { TyObject *result = TySys_GetXOptions(); return Ty_XNewRef(result); diff --git a/Modules/_testlimitedcapi/tuple.c b/Modules/_testlimitedcapi/tuple.c index 1e448b3..387a495 100644 --- a/Modules/_testlimitedcapi/tuple.c +++ b/Modules/_testlimitedcapi/tuple.c @@ -3,27 +3,27 @@ static TyObject * -tuple_check(TyObject* Ty_UNUSED(module), TyObject *obj) +tuple_check(TyObject* Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyTuple_Check(obj)); } static TyObject * -tuple_checkexact(TyObject* Ty_UNUSED(module), TyObject *obj) +tuple_checkexact(TyObject* Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); return TyLong_FromLong(TyTuple_CheckExact(obj)); } static TyObject * -tuple_new(TyObject* Ty_UNUSED(module), TyObject *len) +tuple_new(TyObject* Py_UNUSED(module), TyObject *len) { return TyTuple_New(TyLong_AsSsize_t(len)); } static TyObject * -tuple_pack(TyObject *Ty_UNUSED(module), TyObject *args) +tuple_pack(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *arg1 = NULL, *arg2 = NULL; Ty_ssize_t size; @@ -43,14 +43,14 @@ tuple_pack(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -tuple_size(TyObject *Ty_UNUSED(module), TyObject *obj) +tuple_size(TyObject *Py_UNUSED(module), TyObject *obj) { NULLABLE(obj); RETURN_SIZE(TyTuple_Size(obj)); } static TyObject * -tuple_getitem(TyObject *Ty_UNUSED(module), TyObject *args) +tuple_getitem(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t i; @@ -62,7 +62,7 @@ tuple_getitem(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -tuple_getslice(TyObject *Ty_UNUSED(module), TyObject *args) +tuple_getslice(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj; Ty_ssize_t ilow, ihigh; @@ -74,7 +74,7 @@ tuple_getslice(TyObject *Ty_UNUSED(module), TyObject *args) } static TyObject * -tuple_setitem(TyObject *Ty_UNUSED(module), TyObject *args) +tuple_setitem(TyObject *Py_UNUSED(module), TyObject *args) { TyObject *obj, *value, *newtuple = NULL; Ty_ssize_t i; diff --git a/Modules/_testlimitedcapi/unicode.c b/Modules/_testlimitedcapi/unicode.c index 9047b33..2ae99f5 100644 --- a/Modules/_testlimitedcapi/unicode.c +++ b/Modules/_testlimitedcapi/unicode.c @@ -32,7 +32,7 @@ codec_incrementaldecoder(TyObject *self, TyObject *args) } static TyObject * -test_unicode_compare_with_ascii(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_unicode_compare_with_ascii(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *py_s = TyUnicode_FromStringAndSize("str\0", 4); int result; @@ -45,11 +45,11 @@ test_unicode_compare_with_ascii(TyObject *self, TyObject *Ty_UNUSED(ignored)) "should not compare equal to c string."); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -test_widechar(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_widechar(TyObject *self, TyObject *Py_UNUSED(ignored)) { #if defined(SIZEOF_WCHAR_T) && (SIZEOF_WCHAR_T == 4) const wchar_t wtext[2] = {(wchar_t)0x10ABCDu}; @@ -106,7 +106,7 @@ test_widechar(TyObject *self, TyObject *Ty_UNUSED(ignored)) return NULL; } #endif - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -529,7 +529,7 @@ unicode_asutf8andsize_null(TyObject *self, TyObject *args) /* Test TyUnicode_GetDefaultEncoding() */ static TyObject * -unicode_getdefaultencoding(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_getdefaultencoding(TyObject *self, TyObject *Py_UNUSED(ignored)) { const char *s = TyUnicode_GetDefaultEncoding(); if (s == NULL) @@ -1413,7 +1413,7 @@ check_raised_systemerror(TyObject *result, char* msg) } static TyObject * -test_string_from_format(TyObject *self, TyObject *Ty_UNUSED(ignored)) +test_string_from_format(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *result; TyObject *unicode = TyUnicode_FromString("None"); @@ -1825,7 +1825,7 @@ test_string_from_format(TyObject *self, TyObject *Ty_UNUSED(ignored)) CHECK_FORMAT_2("%1.5lV", "None", NULL, L"None"); Ty_XDECREF(unicode); - Ty_RETURN_NONE; + Py_RETURN_NONE; Fail: Ty_XDECREF(result); diff --git a/Modules/_testlimitedcapi/vectorcall_limited.c b/Modules/_testlimitedcapi/vectorcall_limited.c index f3490dc..5cb2922 100644 --- a/Modules/_testlimitedcapi/vectorcall_limited.c +++ b/Modules/_testlimitedcapi/vectorcall_limited.c @@ -157,7 +157,7 @@ leave: } static TyMemberDef LimitedVectorCallClass_members[] = { - {"__vectorcalloffset__", Ty_T_PYSSIZET, sizeof(TyObject), Ty_READONLY}, + {"__vectorcalloffset__", Ty_T_PYSSIZET, sizeof(TyObject), Py_READONLY}, {NULL} }; @@ -205,7 +205,7 @@ static TyType_Spec LimitedRelativeVectorCallClass_spec = { {Ty_tp_members, (TyMemberDef[]){ {"__vectorcalloffset__", Ty_T_PYSSIZET, offsetof(LimitedRelativeVectorCallStruct, vfunc), - Ty_READONLY | Ty_RELATIVE_OFFSET}, + Py_READONLY | Ty_RELATIVE_OFFSET}, {NULL} }}, {0} diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c index c59cc4b..b4086c9 100644 --- a/Modules/_testmultiphase.c +++ b/Modules/_testmultiphase.c @@ -64,7 +64,7 @@ Example_demo(TyObject *op, TyObject *args) if (o != NULL && TyUnicode_Check(o)) { return Ty_NewRef(o); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #include "clinic/_testmultiphase.c.h" @@ -205,7 +205,7 @@ _testmultiphase_StateAccessType_increment_count_clinic_impl(StateAccessTypeObjec } m_state->counter += n; - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(_StateAccessType_decrement_count__doc__, @@ -251,7 +251,7 @@ _StateAccessType_increment_count_noclinic(TyObject *self, meth_state *m_state = TyType_GetModuleState(defining_class); m_state->counter += n; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -338,7 +338,7 @@ call_state_registration_func(TyObject *mod, TyObject *args) case 0: mod = PyState_FindModule(def); if (mod == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return mod; case 1: @@ -354,7 +354,7 @@ call_state_registration_func(TyObject *mod, TyObject *args) } break; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_testsinglephase.c b/Modules/_testsinglephase.c index 67caa93..3672723 100644 --- a/Modules/_testsinglephase.c +++ b/Modules/_testsinglephase.c @@ -351,11 +351,11 @@ PyDoc_STRVAR(common_state_initialized_doc, Return the seconds-since-epoch when the module state was initialized."); static TyObject * -common_state_initialized(TyObject *self, TyObject *Ty_UNUSED(ignored)) +common_state_initialized(TyObject *self, TyObject *Py_UNUSED(ignored)) { module_state *state = get_module_state(self); if (state == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } double d = PyTime_AsSecondsDouble(state->initialized); return TyFloat_FromDouble(d); @@ -372,7 +372,7 @@ PyDoc_STRVAR(common_look_up_self_doc, Return the module associated with this module's def.m_base.m_index."); static TyObject * -common_look_up_self(TyObject *self, TyObject *Ty_UNUSED(ignored)) +common_look_up_self(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyModuleDef *def = TyModule_GetDef(self); if (def == NULL) { @@ -414,7 +414,7 @@ PyDoc_STRVAR(basic_initialized_count_doc, Return how many times the module has been initialized."); static TyObject * -basic_initialized_count(TyObject *self, TyObject *Ty_UNUSED(ignored)) +basic_initialized_count(TyObject *self, TyObject *Py_UNUSED(ignored)) { assert(TyModule_GetDef(self)->m_size == -1); return TyLong_FromLong(global_state.initialized_count); @@ -431,11 +431,11 @@ PyDoc_STRVAR(basic__clear_globals_doc, Free all global state and set it to uninitialized."); static TyObject * -basic__clear_globals(TyObject *self, TyObject *Ty_UNUSED(ignored)) +basic__clear_globals(TyObject *self, TyObject *Py_UNUSED(ignored)) { assert(TyModule_GetDef(self)->m_size == -1); clear_global_state(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #define _CLEAR_GLOBALS_METHODDEF \ @@ -448,13 +448,13 @@ PyDoc_STRVAR(basic__clear_module_state_doc, "_clear_module_state()\n\ Free the module state and set it to uninitialized."); static TyObject * -basic__clear_module_state(TyObject *self, TyObject *Ty_UNUSED(ignored)) +basic__clear_module_state(TyObject *self, TyObject *Py_UNUSED(ignored)) { module_state *state = get_module_state(self); if (state != NULL) { clear_state(state); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #define _CLEAR_MODULE_STATE_METHODDEF \ diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index 19e5270..eef9cc9 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -655,7 +655,7 @@ PyThreadHandleObject_repr(TyObject *op) } static TyObject * -PyThreadHandleObject_get_ident(TyObject *op, void *Ty_UNUSED(closure)) +PyThreadHandleObject_get_ident(TyObject *op, void *Py_UNUSED(closure)) { PyThreadHandleObject *self = PyThreadHandleObject_CAST(op); return TyLong_FromUnsignedLongLong(ThreadHandle_ident(self->handle)); @@ -682,29 +682,29 @@ PyThreadHandleObject_join(TyObject *op, TyObject *args) if (ThreadHandle_join(self->handle, timeout_ns) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -PyThreadHandleObject_is_done(TyObject *op, TyObject *Ty_UNUSED(dummy)) +PyThreadHandleObject_is_done(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyThreadHandleObject *self = PyThreadHandleObject_CAST(op); if (_PyEvent_IsSet(&self->handle->thread_is_exiting)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } static TyObject * -PyThreadHandleObject_set_done(TyObject *op, TyObject *Ty_UNUSED(dummy)) +PyThreadHandleObject_set_done(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyThreadHandleObject *self = PyThreadHandleObject_CAST(op); if (ThreadHandle_set_done(self->handle) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyGetSetDef ThreadHandle_getsetlist[] = { @@ -853,7 +853,7 @@ PyDoc_STRVAR(enter_doc, Lock the lock."); static TyObject * -lock_PyThread_release_lock(TyObject *op, TyObject *Ty_UNUSED(dummy)) +lock_PyThread_release_lock(TyObject *op, TyObject *Py_UNUSED(dummy)) { lockobject *self = lockobject_CAST(op); /* Sanity check: the lock must be locked */ @@ -862,7 +862,7 @@ lock_PyThread_release_lock(TyObject *op, TyObject *Ty_UNUSED(dummy)) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(release_doc, @@ -886,7 +886,7 @@ PyDoc_STRVAR(lock_exit_doc, Release the lock."); static TyObject * -lock_locked_lock(TyObject *op, TyObject *Ty_UNUSED(dummy)) +lock_locked_lock(TyObject *op, TyObject *Py_UNUSED(dummy)) { lockobject *self = lockobject_CAST(op); return TyBool_FromLong(PyMutex_IsLocked(&self->lock)); @@ -914,11 +914,11 @@ lock_repr(TyObject *op) #ifdef HAVE_FORK static TyObject * -lock__at_fork_reinit(TyObject *op, TyObject *Ty_UNUSED(dummy)) +lock__at_fork_reinit(TyObject *op, TyObject *Py_UNUSED(dummy)) { lockobject *self = lockobject_CAST(op); _PyMutex_at_fork_reinit(&self->lock); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* HAVE_FORK */ @@ -1077,7 +1077,7 @@ PyDoc_STRVAR(rlock_enter_doc, Lock the lock."); static TyObject * -rlock_release(TyObject *op, TyObject *Ty_UNUSED(dummy)) +rlock_release(TyObject *op, TyObject *Py_UNUSED(dummy)) { rlockobject *self = rlockobject_CAST(op); if (_PyRecursiveMutex_TryUnlock(&self->lock) < 0) { @@ -1085,7 +1085,7 @@ rlock_release(TyObject *op, TyObject *Ty_UNUSED(dummy)) "cannot release un-acquired lock"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(rlock_release_doc, @@ -1108,7 +1108,7 @@ PyDoc_STRVAR(rlock_exit_doc, Release the lock."); static TyObject * -rlock_locked(TyObject *op, TyObject *Ty_UNUSED(ignored)) +rlock_locked(TyObject *op, TyObject *Py_UNUSED(ignored)) { rlockobject *self = rlockobject_CAST(op); int is_locked = rlock_locked_impl(self); @@ -1134,7 +1134,7 @@ rlock_acquire_restore(TyObject *op, TyObject *args) _PyRecursiveMutex_Lock(&self->lock); _Ty_atomic_store_ullong_relaxed(&self->lock.thread, owner); self->lock.level = (size_t)count - 1; - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(rlock_acquire_restore_doc, @@ -1144,7 +1144,7 @@ PyDoc_STRVAR(rlock_acquire_restore_doc, For internal use by `threading.Condition`."); static TyObject * -rlock_release_save(TyObject *op, TyObject *Ty_UNUSED(dummy)) +rlock_release_save(TyObject *op, TyObject *Py_UNUSED(dummy)) { rlockobject *self = rlockobject_CAST(op); @@ -1168,7 +1168,7 @@ PyDoc_STRVAR(rlock_release_save_doc, For internal use by `threading.Condition`."); static TyObject * -rlock_recursion_count(TyObject *op, TyObject *Ty_UNUSED(dummy)) +rlock_recursion_count(TyObject *op, TyObject *Py_UNUSED(dummy)) { rlockobject *self = rlockobject_CAST(op); if (_PyRecursiveMutex_IsLockedByCurrentThread(&self->lock)) { @@ -1184,7 +1184,7 @@ PyDoc_STRVAR(rlock_recursion_count_doc, For internal use by reentrancy checks."); static TyObject * -rlock_is_owned(TyObject *op, TyObject *Ty_UNUSED(dummy)) +rlock_is_owned(TyObject *op, TyObject *Py_UNUSED(dummy)) { rlockobject *self = rlockobject_CAST(op); long owned = _PyRecursiveMutex_IsLockedByCurrentThread(&self->lock); @@ -1231,11 +1231,11 @@ rlock_repr(TyObject *op) #ifdef HAVE_FORK static TyObject * -rlock__at_fork_reinit(TyObject *op, TyObject *Ty_UNUSED(dummy)) +rlock__at_fork_reinit(TyObject *op, TyObject *Py_UNUSED(dummy)) { rlockobject *self = rlockobject_CAST(op); self->lock = (_PyRecursiveMutex){0}; - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* HAVE_FORK */ @@ -1370,7 +1370,7 @@ localdummy_dealloc(TyObject *op) } static TyMemberDef local_dummy_type_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(localdummyobject, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(localdummyobject, weakreflist), Py_READONLY}, {NULL}, }; @@ -1698,7 +1698,7 @@ local_setattro(TyObject *op, TyObject *name, TyObject *v) goto err; } - int r = PyObject_RichCompareBool(name, &_Ty_ID(__dict__), Ty_EQ); + int r = PyObject_RichCompareBool(name, &_Ty_ID(__dict__), Py_EQ); if (r == -1) { goto err; } @@ -1721,7 +1721,7 @@ err: static TyObject *local_getattro(TyObject *, TyObject *); static TyMemberDef local_type_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(localobject, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(localobject, weakreflist), Py_READONLY}, {NULL}, }; @@ -1757,7 +1757,7 @@ local_getattro(TyObject *op, TyObject *name) if (ldict == NULL) return NULL; - int r = PyObject_RichCompareBool(name, &_Ty_ID(__dict__), Ty_EQ); + int r = PyObject_RichCompareBool(name, &_Ty_ID(__dict__), Py_EQ); if (r == 1) { return ldict; } @@ -1795,7 +1795,7 @@ clear_locals(TyObject *locals_and_key, TyObject *dummyweakref) TyObject *localweakref = TyTuple_GetItem(locals_and_key, 0); localobject *self = localobject_CAST(_TyWeakref_GET_REF(localweakref)); if (self == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* If the thread-local object is still alive and not being cleared, @@ -1815,20 +1815,20 @@ clear_locals(TyObject *locals_and_key, TyObject *dummyweakref) } Ty_DECREF(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Module functions */ static TyObject * -thread_daemon_threads_allowed(TyObject *module, TyObject *Ty_UNUSED(ignored)) +thread_daemon_threads_allowed(TyObject *module, TyObject *Py_UNUSED(ignored)) { PyInterpreterState *interp = _TyInterpreterState_GET(); if (interp->feature_flags & Ty_RTFLAGS_DAEMON_THREADS) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } @@ -2002,7 +2002,7 @@ the thread to exit if daemon is True. If handle is provided it must be a\n\ newly created thread._ThreadHandle instance."); static TyObject * -thread_PyThread_exit_thread(TyObject *self, TyObject *Ty_UNUSED(ignored)) +thread_PyThread_exit_thread(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyErr_SetNone(TyExc_SystemExit); return NULL; @@ -2033,7 +2033,7 @@ thread_PyThread_interrupt_main(TyObject *self, TyObject *args) TyErr_SetString(TyExc_ValueError, "signal number out of range"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(interrupt_doc, @@ -2049,7 +2049,7 @@ Note: the default signal handler for SIGINT raises ``KeyboardInterrupt``." ); static TyObject * -thread_PyThread_allocate_lock(TyObject *module, TyObject *Ty_UNUSED(ignored)) +thread_PyThread_allocate_lock(TyObject *module, TyObject *Py_UNUSED(ignored)) { return (TyObject *) newlockobject(module); } @@ -2068,7 +2068,7 @@ PyDoc_STRVAR(allocate_doc, An obsolete synonym of allocate_lock()."); static TyObject * -thread_get_ident(TyObject *self, TyObject *Ty_UNUSED(ignored)) +thread_get_ident(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyThread_ident_t ident = PyThread_get_thread_ident_ex(); if (ident == PYTHREAD_INVALID_THREAD_ID) { @@ -2092,7 +2092,7 @@ A thread's identity may be reused for another thread after it exits."); #ifdef PY_HAVE_THREAD_NATIVE_ID static TyObject * -thread_get_native_id(TyObject *self, TyObject *Ty_UNUSED(ignored)) +thread_get_native_id(TyObject *self, TyObject *Py_UNUSED(ignored)) { unsigned long native_id = PyThread_get_thread_native_id(); return TyLong_FromUnsignedLong(native_id); @@ -2108,7 +2108,7 @@ particular thread within a system."); #endif static TyObject * -thread__count(TyObject *self, TyObject *Ty_UNUSED(ignored)) +thread__count(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyInterpreterState *interp = _TyInterpreterState_GET(); return TyLong_FromSsize_t(_Ty_atomic_load_ssize(&interp->threads.count)); @@ -2275,7 +2275,7 @@ thread_excepthook(TyObject *module, TyObject *args) TyObject *exc_type = PyStructSequence_GET_ITEM(args, 0); if (exc_type == TyExc_SystemExit) { /* silently ignore SystemExit */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Borrowed references */ @@ -2291,7 +2291,7 @@ thread_excepthook(TyObject *module, TyObject *args) Ty_XDECREF(file); if (thread == Ty_None) { /* do nothing if sys.stderr is None and thread is None */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } file = PyObject_GetAttrString(thread, "_stderr"); @@ -2302,7 +2302,7 @@ thread_excepthook(TyObject *module, TyObject *args) Ty_DECREF(file); /* do nothing if sys.stderr is None and sys.stderr was None when the thread was created */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -2313,7 +2313,7 @@ thread_excepthook(TyObject *module, TyObject *args) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(excepthook_doc, @@ -2323,7 +2323,7 @@ PyDoc_STRVAR(excepthook_doc, Handle uncaught Thread.run() exception."); static TyObject * -thread__is_main_interpreter(TyObject *module, TyObject *Ty_UNUSED(ignored)) +thread__is_main_interpreter(TyObject *module, TyObject *Py_UNUSED(ignored)) { PyInterpreterState *interp = _TyInterpreterState_GET(); return TyBool_FromLong(_Ty_IsMainInterpreter(interp)); @@ -2368,13 +2368,13 @@ thread_shutdown(TyObject *self, TyObject *args) TyErr_FormatUnraisable("Exception ignored while joining a thread " "in _thread._shutdown()"); ThreadHandle_decref(handle); - Ty_RETURN_NONE; + Py_RETURN_NONE; } ThreadHandle_decref(handle); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(shutdown_doc, @@ -2415,7 +2415,7 @@ Internal only. Make a thread handle for threads not spawned\n\ by the _thread or threading module."); static TyObject * -thread__get_main_thread_ident(TyObject *module, TyObject *Ty_UNUSED(ignored)) +thread__get_main_thread_ident(TyObject *module, TyObject *Py_UNUSED(ignored)) { return TyLong_FromUnsignedLongLong(_PyRuntime.main_thread); } @@ -2548,7 +2548,7 @@ _thread_set_name_impl(TyObject *module, TyObject *name_obj) errno = rc; return TyErr_SetFromErrno(TyExc_OSError); } - Ty_RETURN_NONE; + Py_RETURN_NONE; #else // Windows implementation assert(pSetThreadDescription != NULL); @@ -2576,7 +2576,7 @@ _thread_set_name_impl(TyObject *module, TyObject *name_obj) TyErr_SetFromWindowsErr((int)hr); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; #endif } #endif // HAVE_PTHREAD_SETNAME_NP || HAVE_PTHREAD_SET_NAME_NP || MS_WINDOWS diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 69834c8..e4b483f 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -815,7 +815,7 @@ PyDoc_STRVAR(PyTclObject_string__doc__, "the string representation of this object, either as str or bytes"); static TyObject * -PyTclObject_string(TyObject *_self, void *Ty_UNUSED(closure)) +PyTclObject_string(TyObject *_self, void *Py_UNUSED(closure)) { PyTclObject *self = PyTclObject_CAST(_self); if (!self->string) { @@ -863,7 +863,7 @@ PyTclObject_richcompare(TyObject *self, TyObject *other, int op) /* both arguments should be instances of PyTclObject */ if (!PyTclObject_Check(self) || !PyTclObject_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } if (self == other) { @@ -876,13 +876,13 @@ PyTclObject_richcompare(TyObject *self, TyObject *other, int op) result = strcmp(Tcl_GetString(((PyTclObject *)self)->value), Tcl_GetString(((PyTclObject *)other)->value)); } - Ty_RETURN_RICHCOMPARE(result, 0, op); + Py_RETURN_RICHCOMPARE(result, 0, op); } PyDoc_STRVAR(get_typename__doc__, "name of the Tcl type"); static TyObject* -get_typename(TyObject *self, void *Ty_UNUSED(closure)) +get_typename(TyObject *self, void *Py_UNUSED(closure)) { PyTclObject *obj = PyTclObject_CAST(self); return unicodeFromTclString(obj->value->typePtr->name); @@ -1662,7 +1662,7 @@ _tkinter_tkapp_adderrorinfo_impl(TkappObject *self, const char *msg) Tcl_AddErrorInfo(Tkapp_Interp(self), msg); LEAVE_TCL - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2505,7 +2505,7 @@ _tkinter_tkapp_createcommand_impl(TkappObject *self, const char *name, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2558,7 +2558,7 @@ _tkinter_tkapp_deletecommand_impl(TkappObject *self, const char *name) TyErr_SetString(Tkinter_TclError, "can't delete Tcl command"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2665,7 +2665,7 @@ _tkinter_tkapp_createfilehandler_impl(TkappObject *self, TyObject *file, ENTER_TCL Tcl_CreateFileHandler(tfile, mask, FileHandler, (ClientData) data); LEAVE_TCL - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2696,7 +2696,7 @@ _tkinter_tkapp_deletefilehandler_impl(TkappObject *self, TyObject *file) ENTER_TCL Tcl_DeleteFileHandler(tfile); LEAVE_TCL - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* HAVE_CREATEFILEHANDLER */ @@ -2737,7 +2737,7 @@ _tkinter_tktimertoken_deletetimerhandler_impl(TkttObject *self) Ty_DECREF(func); Ty_DECREF(v); /* See Tktt_New() */ } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TkttObject * @@ -2903,7 +2903,7 @@ _tkinter_tkapp_mainloop_impl(TkappObject *self, int threshold) excInCmd = NULL; return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2935,7 +2935,7 @@ _tkinter_tkapp_quit_impl(TkappObject *self) /*[clinic end generated code: output=7f21eeff481f754f input=e03020dc38aff23c]*/ { quitMainLoop = 1; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2983,7 +2983,7 @@ _tkinter_tkapp_loadtk_impl(TkappObject *self) return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -2998,7 +2998,7 @@ Tkapp_WantObjects(TyObject *op, TyObject *args) return TyLong_FromLong(self->wantobjects); } self->wantobjects = wantobjects; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -3021,7 +3021,7 @@ _tkinter_tkapp_settrace_impl(TkappObject *self, TyObject *func) Ty_INCREF(func); } Ty_XSETREF(self->trace, func); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -3053,7 +3053,7 @@ _tkinter_tkapp_willdispatch_impl(TkappObject *self) { self->dispatching = 1; - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -3233,7 +3233,7 @@ _tkinter_setbusywaitinterval_impl(TyObject *module, int new_val) return NULL; } Tkinter_busywaitinterval = new_val; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -3424,7 +3424,7 @@ DisableEventHook(void) } static int -module_clear(TyObject *Ty_UNUSED(mod)) +module_clear(TyObject *Py_UNUSED(mod)) { Ty_CLEAR(Tkinter_TclError); Ty_CLEAR(Tkapp_Type); @@ -3434,7 +3434,7 @@ module_clear(TyObject *Ty_UNUSED(mod)) } static int -module_traverse(TyObject *Ty_UNUSED(module), visitproc visit, void *arg) +module_traverse(TyObject *Py_UNUSED(module), visitproc visit, void *arg) { Ty_VISIT(Tkinter_TclError); Ty_VISIT(Tkapp_Type); diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c index b430403..594901f 100644 --- a/Modules/_tracemalloc.c +++ b/Modules/_tracemalloc.c @@ -35,7 +35,7 @@ _tracemalloc_clear_traces_impl(TyObject *module) /*[clinic end generated code: output=a86080ee41b84197 input=0dab5b6c785183a5]*/ { _PyTraceMalloc_ClearTraces(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -99,7 +99,7 @@ _tracemalloc_start_impl(TyObject *module, int nframe) if (_PyTraceMalloc_Start(nframe) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -116,7 +116,7 @@ _tracemalloc_stop_impl(TyObject *module) /*[clinic end generated code: output=c3c42ae03e3955cd input=7478f075e51dae18]*/ { _PyTraceMalloc_Stop(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -181,7 +181,7 @@ _tracemalloc_reset_peak_impl(TyObject *module) /*[clinic end generated code: output=140c2870f691dbb2 input=18afd0635066e9ce]*/ { _PyTraceMalloc_ResetPeak(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c index 7a3b8de..ecc1565 100644 --- a/Modules/_uuidmodule.c +++ b/Modules/_uuidmodule.c @@ -25,8 +25,8 @@ #ifndef MS_WINDOWS static TyObject * -py_uuid_generate_time_safe(TyObject *Ty_UNUSED(context), - TyObject *Ty_UNUSED(ignored)) +py_uuid_generate_time_safe(TyObject *Py_UNUSED(context), + TyObject *Py_UNUSED(ignored)) { uuid_t uuid; #ifdef HAVE_UUID_GENERATE_TIME_SAFE @@ -53,8 +53,8 @@ py_uuid_generate_time_safe(TyObject *Ty_UNUSED(context), #else /* MS_WINDOWS */ static TyObject * -py_UuidCreate(TyObject *Ty_UNUSED(context), - TyObject *Ty_UNUSED(ignored)) +py_UuidCreate(TyObject *Py_UNUSED(context), + TyObject *Py_UNUSED(ignored)) { UUID uuid; RPC_STATUS res; diff --git a/Modules/_weakref.c b/Modules/_weakref.c index 173633b..3cc5af3 100644 --- a/Modules/_weakref.c +++ b/Modules/_weakref.c @@ -59,7 +59,7 @@ _weakref__remove_dead_weakref_impl(TyObject *module, TyObject *dct, if (_TyDict_DelItemIf(dct, key, is_dead_weakref, NULL) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_winapi.c b/Modules/_winapi.c index 9481400..dce3150 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -239,7 +239,7 @@ class HANDLE_return_converter(CReturnConverter): self.declare(data) self.err_occurred_if("_return_value == INVALID_HANDLE_VALUE", data) data.return_conversion.append( - 'if (_return_value == NULL) {\n Ty_RETURN_NONE;\n}\n') + 'if (_return_value == NULL) {\n Py_RETURN_NONE;\n}\n') data.return_conversion.append( 'return_value = HANDLE_TO_PYNUM(_return_value);\n') @@ -347,7 +347,7 @@ _winapi_Overlapped_cancel_impl(OverlappedObject *self) if (!res && GetLastError() != ERROR_NOT_FOUND) return TyErr_SetExcFromWindowsErr(TyExc_OSError, 0); self->pending = 0; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef overlapped_methods[] = { @@ -360,7 +360,7 @@ static TyMethodDef overlapped_methods[] = { static TyMemberDef overlapped_members[] = { {"event", T_HANDLE, offsetof(OverlappedObject, overlapped) + offsetof(OVERLAPPED, hEvent), - Ty_READONLY, "overlapped event handle"}, + Py_READONLY, "overlapped event handle"}, {NULL} }; @@ -427,7 +427,7 @@ _winapi_CloseHandle_impl(TyObject *module, HANDLE handle) if (!success) return TyErr_SetFromWindowsErr(0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -473,7 +473,7 @@ _winapi_ConnectNamedPipe_impl(TyObject *module, HANDLE handle, if (!success) return TyErr_SetFromWindowsErr(0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -742,7 +742,7 @@ cleanup: if (ret != 0) return TyErr_SetFromWindowsErr(ret); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1774,7 +1774,7 @@ _winapi_UnmapViewOfFile_impl(TyObject *module, LPCVOID address) return TyErr_SetFromWindowsErr(0); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2088,7 +2088,7 @@ _winapi_ReleaseMutex_impl(TyObject *module, HANDLE mutex) if (err) { return TyErr_SetFromWindowsErr(err); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2111,7 +2111,7 @@ _winapi_ResetEvent_impl(TyObject *module, HANDLE event) if (err) { return TyErr_SetFromWindowsErr(err); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2134,7 +2134,7 @@ _winapi_SetEvent_impl(TyObject *module, HANDLE event) if (err) { return TyErr_SetFromWindowsErr(err); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2175,7 +2175,7 @@ _winapi_SetNamedPipeHandleState_impl(TyObject *module, HANDLE named_pipe, if (!b) return TyErr_SetFromWindowsErr(0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2206,7 +2206,7 @@ _winapi_TerminateProcess_impl(TyObject *module, HANDLE handle, if (! result) return TyErr_SetFromWindowsErr(GetLastError()); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2256,7 +2256,7 @@ _winapi_WaitNamedPipe_impl(TyObject *module, LPCWSTR name, DWORD timeout) if (!success) return TyErr_SetFromWindowsErr(0); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2866,7 +2866,7 @@ _winapi__mimetypes_read_windows_registry_impl(TyObject *module, Ty_DECREF(r); } - Ty_RETURN_NONE; + Py_RETURN_NONE; #undef CCH_EXT #undef CB_TYPE } @@ -2949,7 +2949,7 @@ _winapi_CopyFile2_impl(TyObject *module, LPCWSTR existing_file_name, } return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/_xxtestfuzz/_xxtestfuzz.c b/Modules/_xxtestfuzz/_xxtestfuzz.c index 9f09d49..3a8a091 100644 --- a/Modules/_xxtestfuzz/_xxtestfuzz.c +++ b/Modules/_xxtestfuzz/_xxtestfuzz.c @@ -20,7 +20,7 @@ static TyObject* _fuzz_run(TyObject* self, TyObject* args) { TyExc_RuntimeError, "Nonzero return code from fuzzer: %d", rv); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef module_methods[] = { diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c index 4a14914..9a0cd73 100644 --- a/Modules/_zoneinfo.c +++ b/Modules/_zoneinfo.c @@ -544,7 +544,7 @@ zoneinfo_ZoneInfo_clear_cache_impl(TyTypeObject *type, TyTypeObject *cls, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -774,7 +774,7 @@ zoneinfo_str(TyObject *op) * Objects constructed from ZoneInfo.from_file cannot be pickled. */ static TyObject * -zoneinfo_reduce(TyObject *obj_self, TyObject *Ty_UNUSED(dummy)) +zoneinfo_reduce(TyObject *obj_self, TyObject *Py_UNUSED(dummy)) { PyZoneInfo_ZoneInfo *self = PyZoneInfo_ZoneInfo_CAST(obj_self); if (self->source == SOURCE_FILE) { @@ -912,17 +912,17 @@ static int ttinfo_eq(const _ttinfo *const tti0, const _ttinfo *const tti1) { int rv; - if ((rv = PyObject_RichCompareBool(tti0->utcoff, tti1->utcoff, Ty_EQ)) < + if ((rv = PyObject_RichCompareBool(tti0->utcoff, tti1->utcoff, Py_EQ)) < 1) { goto end; } - if ((rv = PyObject_RichCompareBool(tti0->dstoff, tti1->dstoff, Ty_EQ)) < + if ((rv = PyObject_RichCompareBool(tti0->dstoff, tti1->dstoff, Py_EQ)) < 1) { goto end; } - if ((rv = PyObject_RichCompareBool(tti0->tzname, tti1->tzname, Ty_EQ)) < + if ((rv = PyObject_RichCompareBool(tti0->tzname, tti1->tzname, Py_EQ)) < 1) { goto end; } @@ -2397,7 +2397,7 @@ find_in_strong_cache(const StrongCacheNode *const root, TyObject *const key) { const StrongCacheNode *node = root; while (node != NULL) { - int rv = PyObject_RichCompareBool(key, node->key, Ty_EQ); + int rv = PyObject_RichCompareBool(key, node->key, Py_EQ); if (rv < 0) { return NULL; } @@ -2592,7 +2592,7 @@ zoneinfo_init_subclass(TyObject *cls, TyObject *args, TyObject *kwargs) return NULL; } Ty_DECREF(weak_cache); - Ty_RETURN_NONE; + Py_RETURN_NONE; } ///// @@ -2620,12 +2620,12 @@ static TyMemberDef zoneinfo_members[] = { {.name = "key", .offset = offsetof(PyZoneInfo_ZoneInfo, key), .type = Ty_T_OBJECT_EX, - .flags = Ty_READONLY, + .flags = Py_READONLY, .doc = NULL}, {.name = "__weaklistoffset__", .offset = offsetof(PyZoneInfo_ZoneInfo, weakreflist), .type = Ty_T_PYSSIZET, - .flags = Ty_READONLY}, + .flags = Py_READONLY}, {NULL}, /* Sentinel */ }; diff --git a/Modules/_zstd/_zstdmodule.c b/Modules/_zstd/_zstdmodule.c index c388f1e..8b824f0 100644 --- a/Modules/_zstd/_zstdmodule.c +++ b/Modules/_zstd/_zstdmodule.c @@ -556,7 +556,7 @@ _zstd_set_parameter_types_impl(TyObject *module, TyObject *c_parameter_type, Ty_INCREF(d_parameter_type); Ty_XSETREF(mod_state->DParameter_type, (TyTypeObject*)d_parameter_type); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef _zstd_methods[] = { diff --git a/Modules/_zstd/clinic/decompressor.c.h b/Modules/_zstd/clinic/decompressor.c.h index 4bed229..548b0e9 100644 --- a/Modules/_zstd/clinic/decompressor.c.h +++ b/Modules/_zstd/clinic/decompressor.c.h @@ -111,7 +111,7 @@ static TyObject * _zstd_ZstdDecompressor_unused_data_get_impl(ZstdDecompressor *self); static TyObject * -_zstd_ZstdDecompressor_unused_data_get(TyObject *self, void *Ty_UNUSED(context)) +_zstd_ZstdDecompressor_unused_data_get(TyObject *self, void *Py_UNUSED(context)) { return _zstd_ZstdDecompressor_unused_data_get_impl((ZstdDecompressor *)self); } diff --git a/Modules/_zstd/clinic/zstddict.c.h b/Modules/_zstd/clinic/zstddict.c.h index 26bd4fa..f98b62f 100644 --- a/Modules/_zstd/clinic/zstddict.c.h +++ b/Modules/_zstd/clinic/zstddict.c.h @@ -114,7 +114,7 @@ static TyObject * _zstd_ZstdDict_dict_content_get_impl(ZstdDict *self); static TyObject * -_zstd_ZstdDict_dict_content_get(TyObject *self, void *Ty_UNUSED(context)) +_zstd_ZstdDict_dict_content_get(TyObject *self, void *Py_UNUSED(context)) { return _zstd_ZstdDict_dict_content_get_impl((ZstdDict *)self); } @@ -150,7 +150,7 @@ static TyObject * _zstd_ZstdDict_as_digested_dict_get_impl(ZstdDict *self); static TyObject * -_zstd_ZstdDict_as_digested_dict_get(TyObject *self, void *Ty_UNUSED(context)) +_zstd_ZstdDict_as_digested_dict_get(TyObject *self, void *Py_UNUSED(context)) { return _zstd_ZstdDict_as_digested_dict_get_impl((ZstdDict *)self); } @@ -184,7 +184,7 @@ static TyObject * _zstd_ZstdDict_as_undigested_dict_get_impl(ZstdDict *self); static TyObject * -_zstd_ZstdDict_as_undigested_dict_get(TyObject *self, void *Ty_UNUSED(context)) +_zstd_ZstdDict_as_undigested_dict_get(TyObject *self, void *Py_UNUSED(context)) { return _zstd_ZstdDict_as_undigested_dict_get_impl((ZstdDict *)self); } @@ -218,7 +218,7 @@ static TyObject * _zstd_ZstdDict_as_prefix_get_impl(ZstdDict *self); static TyObject * -_zstd_ZstdDict_as_prefix_get(TyObject *self, void *Ty_UNUSED(context)) +_zstd_ZstdDict_as_prefix_get(TyObject *self, void *Py_UNUSED(context)) { return _zstd_ZstdDict_as_prefix_get_impl((ZstdDict *)self); } diff --git a/Modules/_zstd/compressor.c b/Modules/_zstd/compressor.c index ccb4aaf..e226735 100644 --- a/Modules/_zstd/compressor.c +++ b/Modules/_zstd/compressor.c @@ -737,7 +737,7 @@ _zstd_ZstdCompressor_set_pledged_input_size_impl(ZstdCompressor *self, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef ZstdCompressor_methods[] = { @@ -755,7 +755,7 @@ PyDoc_STRVAR(ZstdCompressor_last_mode_doc, static TyMemberDef ZstdCompressor_members[] = { {"last_mode", Ty_T_INT, offsetof(ZstdCompressor, last_mode), - Ty_READONLY, ZstdCompressor_last_mode_doc}, + Py_READONLY, ZstdCompressor_last_mode_doc}, {NULL} }; diff --git a/Modules/_zstd/decompressor.c b/Modules/_zstd/decompressor.c index 43d8f5d..ad1ab84 100644 --- a/Modules/_zstd/decompressor.c +++ b/Modules/_zstd/decompressor.c @@ -668,9 +668,9 @@ PyDoc_STRVAR(ZstdDecompressor_needs_input_doc, static TyMemberDef ZstdDecompressor_members[] = { {"eof", Ty_T_BOOL, offsetof(ZstdDecompressor, eof), - Ty_READONLY, ZstdDecompressor_eof_doc}, + Py_READONLY, ZstdDecompressor_eof_doc}, {"needs_input", Ty_T_BOOL, offsetof(ZstdDecompressor, needs_input), - Ty_READONLY, ZstdDecompressor_needs_input_doc}, + Py_READONLY, ZstdDecompressor_needs_input_doc}, {NULL} }; diff --git a/Modules/_zstd/zstddict.c b/Modules/_zstd/zstddict.c index 8e3ad63..a9cff6e 100644 --- a/Modules/_zstd/zstddict.c +++ b/Modules/_zstd/zstddict.c @@ -134,7 +134,7 @@ ZstdDict_repr(TyObject *ob) } static TyMemberDef ZstdDict_members[] = { - {"dict_id", Ty_T_UINT, offsetof(ZstdDict, dict_id), Ty_READONLY, ZstdDict_dictid_doc}, + {"dict_id", Ty_T_UINT, offsetof(ZstdDict, dict_id), Py_READONLY, ZstdDict_dictid_doc}, {NULL} }; diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index be58357..7443a8c 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -748,14 +748,14 @@ array_richcompare(TyObject *v, TyObject *w, int op) TyObject *res; if (!array_Check(v, state) || !array_Check(w, state)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; va = (arrayobject *)v; wa = (arrayobject *)w; - if (Ty_SIZE(va) != Ty_SIZE(wa) && (op == Ty_EQ || op == Ty_NE)) { + if (Ty_SIZE(va) != Ty_SIZE(wa) && (op == Py_EQ || op == Py_NE)) { /* Shortcut: if the lengths differ, the arrays differ */ - if (op == Ty_EQ) + if (op == Py_EQ) res = Ty_False; else res = Ty_True; @@ -773,12 +773,12 @@ array_richcompare(TyObject *v, TyObject *w, int op) int cmp; switch (op) { - case Ty_LT: cmp = result < 0; break; - case Ty_LE: cmp = result <= 0; break; - case Ty_EQ: cmp = result == 0; break; - case Ty_NE: cmp = result != 0; break; - case Ty_GT: cmp = result > 0; break; - case Ty_GE: cmp = result >= 0; break; + case Py_LT: cmp = result < 0; break; + case Py_LE: cmp = result <= 0; break; + case Py_EQ: cmp = result == 0; break; + case Py_NE: cmp = result != 0; break; + case Py_GT: cmp = result > 0; break; + case Py_GE: cmp = result >= 0; break; default: return NULL; /* cannot happen */ } TyObject *res = cmp ? Ty_True : Ty_False; @@ -798,7 +798,7 @@ array_richcompare(TyObject *v, TyObject *w, int op) Ty_DECREF(vi); return NULL; } - k = PyObject_RichCompareBool(vi, wi, Ty_EQ); + k = PyObject_RichCompareBool(vi, wi, Py_EQ); if (k == 0) break; /* Keeping vi and wi alive! */ Ty_DECREF(vi); @@ -814,14 +814,14 @@ array_richcompare(TyObject *v, TyObject *w, int op) Ty_ssize_t ws = Ty_SIZE(wa); int cmp; switch (op) { - case Ty_LT: cmp = vs < ws; break; - case Ty_LE: cmp = vs <= ws; break; + case Py_LT: cmp = vs < ws; break; + case Py_LE: cmp = vs <= ws; break; /* If the lengths were not equal, the earlier fast-path check would have caught that. */ - case Ty_EQ: assert(vs == ws); cmp = 1; break; - case Ty_NE: assert(vs == ws); cmp = 0; break; - case Ty_GT: cmp = vs > ws; break; - case Ty_GE: cmp = vs >= ws; break; + case Py_EQ: assert(vs == ws); cmp = 1; break; + case Py_NE: assert(vs == ws); cmp = 0; break; + case Py_GT: cmp = vs > ws; break; + case Py_GE: cmp = vs >= ws; break; default: return NULL; /* cannot happen */ } if (cmp) @@ -832,10 +832,10 @@ array_richcompare(TyObject *v, TyObject *w, int op) } /* We have an item that differs. First, shortcuts for EQ/NE */ - if (op == Ty_EQ) { + if (op == Py_EQ) { res = Ty_NewRef(Ty_False); } - else if (op == Ty_NE) { + else if (op == Py_NE) { res = Ty_NewRef(Ty_True); } else { @@ -902,7 +902,7 @@ array_array_clear_impl(arrayobject *self) if (array_resize(self, 0) == -1) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1160,7 +1160,7 @@ ins(arrayobject *self, Ty_ssize_t where, TyObject *v) { if (ins1(self, where, v) != 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1186,7 +1186,7 @@ array_array_count_impl(arrayobject *self, TyObject *v) selfi = getarrayitem((TyObject *)self, i); if (selfi == NULL) return NULL; - cmp = PyObject_RichCompareBool(selfi, v, Ty_EQ); + cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); Ty_DECREF(selfi); if (cmp > 0) count++; @@ -1233,7 +1233,7 @@ array_array_index_impl(arrayobject *self, TyObject *v, Ty_ssize_t start, selfi = getarrayitem((TyObject *)self, i); if (selfi == NULL) return NULL; - cmp = PyObject_RichCompareBool(selfi, v, Ty_EQ); + cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); Ty_DECREF(selfi); if (cmp > 0) { return TyLong_FromSsize_t(i); @@ -1255,7 +1255,7 @@ array_contains(TyObject *self, TyObject *v) TyObject *selfi = getarrayitem(self, i); if (selfi == NULL) return -1; - cmp = PyObject_RichCompareBool(selfi, v, Ty_EQ); + cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); Ty_DECREF(selfi); } return cmp; @@ -1283,12 +1283,12 @@ array_array_remove_impl(arrayobject *self, TyObject *v) selfi = getarrayitem((TyObject *)self,i); if (selfi == NULL) return NULL; - cmp = PyObject_RichCompareBool(selfi, v, Ty_EQ); + cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); Ty_DECREF(selfi); if (cmp > 0) { if (array_del_slice(self, i, i+1) != 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } else if (cmp < 0) return NULL; @@ -1353,7 +1353,7 @@ array_array_extend_impl(arrayobject *self, TyTypeObject *cls, TyObject *bb) if (array_do_extend(state, self, bb) == -1) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1482,7 +1482,7 @@ array_array_byteswap_impl(arrayobject *self) "don't know how to byteswap this array type"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1515,7 +1515,7 @@ array_array_reverse_impl(arrayobject *self) } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1628,7 +1628,7 @@ array_array_tofile_impl(arrayobject *self, TyTypeObject *cls, TyObject *f) } done: - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1671,7 +1671,7 @@ array_array_fromlist_impl(arrayobject *self, TyObject *list) } } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1735,7 +1735,7 @@ frombytes(arrayobject *self, Ty_buffer *buffer) buffer->buf, n * itemsize); } PyBuffer_Release(buffer); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1831,7 +1831,7 @@ array_array_fromunicode_impl(arrayobject *self, TyObject *ustr) (void)u; // Suppress unused_variable warning. } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2359,7 +2359,7 @@ array_array___reduce_ex___impl(arrayobject *self, TyTypeObject *cls, } static TyObject * -array_get_typecode(TyObject *op, void *Ty_UNUSED(closure)) +array_get_typecode(TyObject *op, void *Py_UNUSED(closure)) { arrayobject *a = arrayobject_CAST(op); char typecode = a->ob_descr->typecode; @@ -2367,7 +2367,7 @@ array_get_typecode(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -array_get_itemsize(TyObject *op, void *Ty_UNUSED(closure)) +array_get_itemsize(TyObject *op, void *Py_UNUSED(closure)) { arrayobject *a = arrayobject_CAST(op); return TyLong_FromLong((long)a->ob_descr->itemsize); @@ -2705,7 +2705,7 @@ array_buffer_getbuf(TyObject *op, Ty_buffer *view, int flags) } static void -array_buffer_relbuf(TyObject *op, Ty_buffer *Ty_UNUSED(view)) +array_buffer_relbuf(TyObject *op, Ty_buffer *Py_UNUSED(view)) { arrayobject *self = arrayobject_CAST(op); self->ob_exports--; @@ -2945,7 +2945,7 @@ itemsize -- the length in bytes of one array item\n\ static TyObject *array_iter(TyObject *op); static struct TyMemberDef array_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(arrayobject, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(arrayobject, weakreflist), Py_READONLY}, {NULL}, }; @@ -3117,7 +3117,7 @@ array_arrayiterator___setstate___impl(arrayiterobject *self, TyObject *state) } self->index = index; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef arrayiter_methods[] = { diff --git a/Modules/blake2module.c b/Modules/blake2module.c index 7729455..5d0a9ae 100644 --- a/Modules/blake2module.c +++ b/Modules/blake2module.c @@ -835,7 +835,7 @@ _blake2_blake2b_update_impl(Blake2Object *self, TyObject *data) PyBuffer_Release(&buf); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -925,7 +925,7 @@ static TyMethodDef py_blake2b_methods[] = { static TyObject * -py_blake2b_get_name(TyObject *op, void *Ty_UNUSED(closure)) +py_blake2b_get_name(TyObject *op, void *Py_UNUSED(closure)) { Blake2Object *self = _Blake2Object_CAST(op); return TyUnicode_FromString(is_blake2b(self->impl) ? "blake2b" : "blake2s"); @@ -934,7 +934,7 @@ py_blake2b_get_name(TyObject *op, void *Ty_UNUSED(closure)) static TyObject * -py_blake2b_get_block_size(TyObject *op, void *Ty_UNUSED(closure)) +py_blake2b_get_block_size(TyObject *op, void *Py_UNUSED(closure)) { Blake2Object *self = _Blake2Object_CAST(op); return TyLong_FromLong(is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_BLOCK_BYTES : HACL_HASH_BLAKE2S_BLOCK_BYTES); @@ -943,7 +943,7 @@ py_blake2b_get_block_size(TyObject *op, void *Ty_UNUSED(closure)) static TyObject * -py_blake2b_get_digest_size(TyObject *op, void *Ty_UNUSED(closure)) +py_blake2b_get_digest_size(TyObject *op, void *Py_UNUSED(closure)) { Blake2Object *self = _Blake2Object_CAST(op); switch (self->impl) { diff --git a/Modules/cjkcodecs/clinic/multibytecodec.c.h b/Modules/cjkcodecs/clinic/multibytecodec.c.h index f520d7f..bee16d3 100644 --- a/Modules/cjkcodecs/clinic/multibytecodec.c.h +++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h @@ -274,7 +274,7 @@ static TyObject * _multibytecodec_MultibyteIncrementalEncoder_getstate_impl(MultibyteIncrementalEncoderObject *self); static TyObject * -_multibytecodec_MultibyteIncrementalEncoder_getstate(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multibytecodec_MultibyteIncrementalEncoder_getstate(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _multibytecodec_MultibyteIncrementalEncoder_getstate_impl((MultibyteIncrementalEncoderObject *)self); } @@ -320,7 +320,7 @@ static TyObject * _multibytecodec_MultibyteIncrementalEncoder_reset_impl(MultibyteIncrementalEncoderObject *self); static TyObject * -_multibytecodec_MultibyteIncrementalEncoder_reset(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multibytecodec_MultibyteIncrementalEncoder_reset(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _multibytecodec_MultibyteIncrementalEncoder_reset_impl((MultibyteIncrementalEncoderObject *)self); } @@ -413,7 +413,7 @@ static TyObject * _multibytecodec_MultibyteIncrementalDecoder_getstate_impl(MultibyteIncrementalDecoderObject *self); static TyObject * -_multibytecodec_MultibyteIncrementalDecoder_getstate(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multibytecodec_MultibyteIncrementalDecoder_getstate(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _multibytecodec_MultibyteIncrementalDecoder_getstate_impl((MultibyteIncrementalDecoderObject *)self); } @@ -459,7 +459,7 @@ static TyObject * _multibytecodec_MultibyteIncrementalDecoder_reset_impl(MultibyteIncrementalDecoderObject *self); static TyObject * -_multibytecodec_MultibyteIncrementalDecoder_reset(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multibytecodec_MultibyteIncrementalDecoder_reset(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _multibytecodec_MultibyteIncrementalDecoder_reset_impl((MultibyteIncrementalDecoderObject *)self); } @@ -572,7 +572,7 @@ static TyObject * _multibytecodec_MultibyteStreamReader_reset_impl(MultibyteStreamReaderObject *self); static TyObject * -_multibytecodec_MultibyteStreamReader_reset(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_multibytecodec_MultibyteStreamReader_reset(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _multibytecodec_MultibyteStreamReader_reset_impl((MultibyteStreamReaderObject *)self); } diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c index 57a5c9e..7e7f05c 100644 --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -157,7 +157,7 @@ call_error_callback(TyObject *errors, TyObject *exc) } static TyObject * -codecctx_errors_get(TyObject *op, void *Ty_UNUSED(closure)) +codecctx_errors_get(TyObject *op, void *Py_UNUSED(closure)) { const char *errors; MultibyteStatefulCodecContext *self = _MultibyteStatefulCodecContext_CAST(op); @@ -176,7 +176,7 @@ codecctx_errors_get(TyObject *op, void *Ty_UNUSED(closure)) } static int -codecctx_errors_set(TyObject *op, TyObject *value, void *Ty_UNUSED(closure)) +codecctx_errors_set(TyObject *op, TyObject *value, void *Py_UNUSED(closure)) { TyObject *cb; const char *str; @@ -1042,7 +1042,7 @@ _multibytecodec_MultibyteIncrementalEncoder_setstate_impl(MultibyteIncrementalEn memcpy(self->state.c, statebytes+1+statebytes[0], sizeof(self->state.c)); - Ty_RETURN_NONE; + Py_RETURN_NONE; errorexit: Ty_XDECREF(pending); @@ -1068,7 +1068,7 @@ _multibytecodec_MultibyteIncrementalEncoder_reset_impl(MultibyteIncrementalEncod return NULL; } Ty_CLEAR(self->pending); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static struct TyMethodDef mbiencoder_methods[] = { @@ -1335,7 +1335,7 @@ _multibytecodec_MultibyteIncrementalDecoder_setstate_impl(MultibyteIncrementalDe memcpy(self->pending, bufferstr, self->pendingsize); memcpy(self->state.c, statebytes, sizeof(statebytes)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1351,7 +1351,7 @@ _multibytecodec_MultibyteIncrementalDecoder_reset_impl(MultibyteIncrementalDecod return NULL; self->pendingsize = 0; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static struct TyMethodDef mbidecoder_methods[] = { @@ -1660,7 +1660,7 @@ _multibytecodec_MultibyteStreamReader_reset_impl(MultibyteStreamReaderObject *se return NULL; self->pendingsize = 0; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static struct TyMethodDef mbstreamreader_methods[] = { @@ -1674,7 +1674,7 @@ static struct TyMethodDef mbstreamreader_methods[] = { static TyMemberDef mbstreamreader_members[] = { {"stream", _Ty_T_OBJECT, offsetof(MultibyteStreamReaderObject, stream), - Ty_READONLY, NULL}, + Py_READONLY, NULL}, {NULL,} }; @@ -1808,7 +1808,7 @@ _multibytecodec_MultibyteStreamWriter_write_impl(MultibyteStreamWriterObject *se if (mbstreamwriter_iwrite(self, strobj, state->str_write)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1851,7 +1851,7 @@ _multibytecodec_MultibyteStreamWriter_writelines_impl(MultibyteStreamWriterObjec if (TyErr_Occurred()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1870,7 +1870,7 @@ _multibytecodec_MultibyteStreamWriter_reset_impl(MultibyteStreamWriterObject *se TyObject *pwrt; if (!self->pending) - Ty_RETURN_NONE; + Py_RETURN_NONE; pwrt = multibytecodec_encode(self->codec, &self->state, self->pending, NULL, self->errors, @@ -1899,7 +1899,7 @@ _multibytecodec_MultibyteStreamWriter_reset_impl(MultibyteStreamWriterObject *se } Ty_DECREF(pwrt); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1984,7 +1984,7 @@ static struct TyMethodDef mbstreamwriter_methods[] = { static TyMemberDef mbstreamwriter_members[] = { {"stream", _Ty_T_OBJECT, offsetof(MultibyteStreamWriterObject, stream), - Ty_READONLY, NULL}, + Py_READONLY, NULL}, {NULL,} }; diff --git a/Modules/clinic/_abc.c.h b/Modules/clinic/_abc.c.h index c045ca6..e7a0a96 100644 --- a/Modules/clinic/_abc.c.h +++ b/Modules/clinic/_abc.c.h @@ -157,7 +157,7 @@ static TyObject * _abc_get_cache_token_impl(TyObject *module); static TyObject * -_abc_get_cache_token(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_abc_get_cache_token(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _abc_get_cache_token_impl(module); } diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h index 32da5a8..224cbed 100644 --- a/Modules/clinic/_asynciomodule.c.h +++ b/Modules/clinic/_asynciomodule.c.h @@ -99,7 +99,7 @@ static TyObject * _asyncio_Future_result_impl(FutureObj *self); static TyObject * -_asyncio_Future_result(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Future_result(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -448,7 +448,7 @@ static TyObject * _asyncio_Future_cancelled_impl(FutureObj *self); static TyObject * -_asyncio_Future_cancelled(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Future_cancelled(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -475,7 +475,7 @@ static TyObject * _asyncio_Future_done_impl(FutureObj *self); static TyObject * -_asyncio_Future_done(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Future_done(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -529,7 +529,7 @@ static TyObject * _asyncio_Future__asyncio_awaited_by_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__asyncio_awaited_by_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__asyncio_awaited_by_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -554,7 +554,7 @@ static TyObject * _asyncio_Future__asyncio_future_blocking_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__asyncio_future_blocking_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__asyncio_future_blocking_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -580,7 +580,7 @@ _asyncio_Future__asyncio_future_blocking_set_impl(FutureObj *self, TyObject *value); static int -_asyncio_Future__asyncio_future_blocking_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_asyncio_Future__asyncio_future_blocking_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -605,7 +605,7 @@ static TyObject * _asyncio_Future__log_traceback_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__log_traceback_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__log_traceback_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -630,7 +630,7 @@ static int _asyncio_Future__log_traceback_set_impl(FutureObj *self, TyObject *value); static int -_asyncio_Future__log_traceback_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_asyncio_Future__log_traceback_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -655,7 +655,7 @@ static TyObject * _asyncio_Future__loop_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__loop_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__loop_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -680,7 +680,7 @@ static TyObject * _asyncio_Future__callbacks_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__callbacks_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__callbacks_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -705,7 +705,7 @@ static TyObject * _asyncio_Future__result_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__result_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__result_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -730,7 +730,7 @@ static TyObject * _asyncio_Future__exception_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__exception_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__exception_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -755,7 +755,7 @@ static TyObject * _asyncio_Future__source_traceback_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__source_traceback_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__source_traceback_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -780,7 +780,7 @@ static TyObject * _asyncio_Future__cancel_message_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__cancel_message_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__cancel_message_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -805,7 +805,7 @@ static int _asyncio_Future__cancel_message_set_impl(FutureObj *self, TyObject *value); static int -_asyncio_Future__cancel_message_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_asyncio_Future__cancel_message_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -830,7 +830,7 @@ static TyObject * _asyncio_Future__state_get_impl(FutureObj *self); static TyObject * -_asyncio_Future__state_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Future__state_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -857,7 +857,7 @@ static TyObject * _asyncio_Future__make_cancelled_error_impl(FutureObj *self); static TyObject * -_asyncio_Future__make_cancelled_error(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Future__make_cancelled_error(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -972,7 +972,7 @@ static TyObject * _asyncio_Task__log_destroy_pending_get_impl(TaskObj *self); static TyObject * -_asyncio_Task__log_destroy_pending_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Task__log_destroy_pending_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -997,7 +997,7 @@ static int _asyncio_Task__log_destroy_pending_set_impl(TaskObj *self, TyObject *value); static int -_asyncio_Task__log_destroy_pending_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_asyncio_Task__log_destroy_pending_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -1022,7 +1022,7 @@ static TyObject * _asyncio_Task__must_cancel_get_impl(TaskObj *self); static TyObject * -_asyncio_Task__must_cancel_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Task__must_cancel_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1047,7 +1047,7 @@ static TyObject * _asyncio_Task__coro_get_impl(TaskObj *self); static TyObject * -_asyncio_Task__coro_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Task__coro_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1072,7 +1072,7 @@ static TyObject * _asyncio_Task__fut_waiter_get_impl(TaskObj *self); static TyObject * -_asyncio_Task__fut_waiter_get(TyObject *self, void *Ty_UNUSED(context)) +_asyncio_Task__fut_waiter_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1099,7 +1099,7 @@ static TyObject * _asyncio_Task__make_cancelled_error_impl(TaskObj *self); static TyObject * -_asyncio_Task__make_cancelled_error(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Task__make_cancelled_error(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1210,7 +1210,7 @@ static TyObject * _asyncio_Task_cancelling_impl(TaskObj *self); static TyObject * -_asyncio_Task_cancelling(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Task_cancelling(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1239,7 +1239,7 @@ static TyObject * _asyncio_Task_uncancel_impl(TaskObj *self); static TyObject * -_asyncio_Task_uncancel(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Task_uncancel(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1463,7 +1463,7 @@ static TyObject * _asyncio_Task_get_coro_impl(TaskObj *self); static TyObject * -_asyncio_Task_get_coro(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Task_get_coro(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1486,7 +1486,7 @@ static TyObject * _asyncio_Task_get_context_impl(TaskObj *self); static TyObject * -_asyncio_Task_get_context(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Task_get_context(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _asyncio_Task_get_context_impl((TaskObj *)self); } @@ -1503,7 +1503,7 @@ static TyObject * _asyncio_Task_get_name_impl(TaskObj *self); static TyObject * -_asyncio_Task_get_name(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_asyncio_Task_get_name(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1553,7 +1553,7 @@ static TyObject * _asyncio__get_running_loop_impl(TyObject *module); static TyObject * -_asyncio__get_running_loop(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_asyncio__get_running_loop(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _asyncio__get_running_loop_impl(module); } @@ -1590,7 +1590,7 @@ static TyObject * _asyncio_get_event_loop_impl(TyObject *module); static TyObject * -_asyncio_get_event_loop(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_asyncio_get_event_loop(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _asyncio_get_event_loop_impl(module); } @@ -1610,7 +1610,7 @@ static TyObject * _asyncio_get_running_loop_impl(TyObject *module); static TyObject * -_asyncio_get_running_loop(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_asyncio_get_running_loop(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _asyncio_get_running_loop_impl(module); } diff --git a/Modules/clinic/_bz2module.c.h b/Modules/clinic/_bz2module.c.h index aa9cc7a..7901b09 100644 --- a/Modules/clinic/_bz2module.c.h +++ b/Modules/clinic/_bz2module.c.h @@ -63,7 +63,7 @@ static TyObject * _bz2_BZ2Compressor_flush_impl(BZ2Compressor *self); static TyObject * -_bz2_BZ2Compressor_flush(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_bz2_BZ2Compressor_flush(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _bz2_BZ2Compressor_flush_impl((BZ2Compressor *)self); } diff --git a/Modules/clinic/_collectionsmodule.c.h b/Modules/clinic/_collectionsmodule.c.h index 0630ecc..1a5789a 100644 --- a/Modules/clinic/_collectionsmodule.c.h +++ b/Modules/clinic/_collectionsmodule.c.h @@ -23,7 +23,7 @@ static TyObject * deque_pop_impl(dequeobject *deque); static TyObject * -deque_pop(TyObject *deque, TyObject *Ty_UNUSED(ignored)) +deque_pop(TyObject *deque, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -47,7 +47,7 @@ static TyObject * deque_popleft_impl(dequeobject *deque); static TyObject * -deque_popleft(TyObject *deque, TyObject *Ty_UNUSED(ignored)) +deque_popleft(TyObject *deque, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -167,7 +167,7 @@ static TyObject * deque_copy_impl(dequeobject *deque); static TyObject * -deque_copy(TyObject *deque, TyObject *Ty_UNUSED(ignored)) +deque_copy(TyObject *deque, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -191,7 +191,7 @@ static TyObject * deque___copy___impl(dequeobject *deque); static TyObject * -deque___copy__(TyObject *deque, TyObject *Ty_UNUSED(ignored)) +deque___copy__(TyObject *deque, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -215,7 +215,7 @@ static TyObject * deque_clearmethod_impl(dequeobject *deque); static TyObject * -deque_clearmethod(TyObject *deque, TyObject *Ty_UNUSED(ignored)) +deque_clearmethod(TyObject *deque, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -284,7 +284,7 @@ static TyObject * deque_reverse_impl(dequeobject *deque); static TyObject * -deque_reverse(TyObject *deque, TyObject *Ty_UNUSED(ignored)) +deque_reverse(TyObject *deque, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -447,7 +447,7 @@ static TyObject * deque___reduce___impl(dequeobject *deque); static TyObject * -deque___reduce__(TyObject *deque, TyObject *Ty_UNUSED(ignored)) +deque___reduce__(TyObject *deque, TyObject *Py_UNUSED(ignored)) { return deque___reduce___impl((dequeobject *)deque); } @@ -536,7 +536,7 @@ static TyObject * deque___sizeof___impl(dequeobject *deque); static TyObject * -deque___sizeof__(TyObject *deque, TyObject *Ty_UNUSED(ignored)) +deque___sizeof__(TyObject *deque, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -560,7 +560,7 @@ static TyObject * deque___reversed___impl(dequeobject *deque); static TyObject * -deque___reversed__(TyObject *deque, TyObject *Ty_UNUSED(ignored)) +deque___reversed__(TyObject *deque, TyObject *Py_UNUSED(ignored)) { return deque___reversed___impl((dequeobject *)deque); } diff --git a/Modules/clinic/_csv.c.h b/Modules/clinic/_csv.c.h index a817ed1..acd2da1 100644 --- a/Modules/clinic/_csv.c.h +++ b/Modules/clinic/_csv.c.h @@ -23,7 +23,7 @@ static TyObject * _csv_list_dialects_impl(TyObject *module); static TyObject * -_csv_list_dialects(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_csv_list_dialects(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _csv_list_dialects_impl(module); } diff --git a/Modules/clinic/_curses_panel.c.h b/Modules/clinic/_curses_panel.c.h index 8e2eb9e..77143a4 100644 --- a/Modules/clinic/_curses_panel.c.h +++ b/Modules/clinic/_curses_panel.c.h @@ -110,7 +110,7 @@ static TyObject * _curses_panel_panel_above_impl(PyCursesPanelObject *self); static TyObject * -_curses_panel_panel_above(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_curses_panel_panel_above(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _curses_panel_panel_above_impl((PyCursesPanelObject *)self); } @@ -128,7 +128,7 @@ static TyObject * _curses_panel_panel_below_impl(PyCursesPanelObject *self); static TyObject * -_curses_panel_panel_below(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_curses_panel_panel_below(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _curses_panel_panel_below_impl((PyCursesPanelObject *)self); } @@ -146,7 +146,7 @@ static TyObject * _curses_panel_panel_hidden_impl(PyCursesPanelObject *self); static TyObject * -_curses_panel_panel_hidden(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_curses_panel_panel_hidden(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _curses_panel_panel_hidden_impl((PyCursesPanelObject *)self); } @@ -217,7 +217,7 @@ static TyObject * _curses_panel_panel_window_impl(PyCursesPanelObject *self); static TyObject * -_curses_panel_panel_window(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_curses_panel_panel_window(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _curses_panel_panel_window_impl((PyCursesPanelObject *)self); } @@ -353,7 +353,7 @@ static TyObject * _curses_panel_bottom_panel_impl(TyObject *module); static TyObject * -_curses_panel_bottom_panel(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_panel_bottom_panel(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_panel_bottom_panel_impl(module); } @@ -400,7 +400,7 @@ static TyObject * _curses_panel_top_panel_impl(TyObject *module); static TyObject * -_curses_panel_top_panel(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_panel_top_panel(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_panel_top_panel_impl(module); } @@ -420,7 +420,7 @@ static TyObject * _curses_panel_update_panels_impl(TyObject *module); static TyObject * -_curses_panel_update_panels(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_panel_update_panels(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_panel_update_panels_impl(module); } diff --git a/Modules/clinic/_cursesmodule.c.h b/Modules/clinic/_cursesmodule.c.h index aa77305..8376023 100644 --- a/Modules/clinic/_cursesmodule.c.h +++ b/Modules/clinic/_cursesmodule.c.h @@ -737,7 +737,7 @@ static long _curses_window_getbkgd_impl(PyCursesWindowObject *self); static TyObject * -_curses_window_getbkgd(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_curses_window_getbkgd(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; long _return_value; @@ -1340,7 +1340,7 @@ static TyObject * _curses_window_noutrefresh_impl(PyCursesWindowObject *self); static TyObject * -_curses_window_noutrefresh(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_curses_window_noutrefresh(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _curses_window_noutrefresh_impl((PyCursesWindowObject *)self); } @@ -1855,7 +1855,7 @@ static TyObject * _curses_filter_impl(TyObject *module); static TyObject * -_curses_filter(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_filter(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_filter_impl(module); } @@ -1875,7 +1875,7 @@ static TyObject * _curses_baudrate_impl(TyObject *module); static TyObject * -_curses_baudrate(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_baudrate(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_baudrate_impl(module); } @@ -1893,7 +1893,7 @@ static TyObject * _curses_beep_impl(TyObject *module); static TyObject * -_curses_beep(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_beep(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_beep_impl(module); } @@ -1911,7 +1911,7 @@ static TyObject * _curses_can_change_color_impl(TyObject *module); static TyObject * -_curses_can_change_color(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_can_change_color(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_can_change_color_impl(module); } @@ -2080,7 +2080,7 @@ static TyObject * _curses_def_prog_mode_impl(TyObject *module); static TyObject * -_curses_def_prog_mode(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_def_prog_mode(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_def_prog_mode_impl(module); } @@ -2102,7 +2102,7 @@ static TyObject * _curses_def_shell_mode_impl(TyObject *module); static TyObject * -_curses_def_shell_mode(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_def_shell_mode(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_def_shell_mode_impl(module); } @@ -2151,7 +2151,7 @@ static TyObject * _curses_doupdate_impl(TyObject *module); static TyObject * -_curses_doupdate(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_doupdate(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_doupdate_impl(module); } @@ -2209,7 +2209,7 @@ static TyObject * _curses_endwin_impl(TyObject *module); static TyObject * -_curses_endwin(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_endwin(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_endwin_impl(module); } @@ -2227,7 +2227,7 @@ static TyObject * _curses_erasechar_impl(TyObject *module); static TyObject * -_curses_erasechar(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_erasechar(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_erasechar_impl(module); } @@ -2247,7 +2247,7 @@ static TyObject * _curses_flash_impl(TyObject *module); static TyObject * -_curses_flash(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_flash(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_flash_impl(module); } @@ -2268,7 +2268,7 @@ static TyObject * _curses_flushinp_impl(TyObject *module); static TyObject * -_curses_flushinp(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_flushinp(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_flushinp_impl(module); } @@ -2290,7 +2290,7 @@ static TyObject * _curses_getsyx_impl(TyObject *module); static TyObject * -_curses_getsyx(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_getsyx(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_getsyx_impl(module); } @@ -2315,7 +2315,7 @@ static TyObject * _curses_getmouse_impl(TyObject *module); static TyObject * -_curses_getmouse(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_getmouse(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_getmouse_impl(module); } @@ -2469,7 +2469,7 @@ static TyObject * _curses_has_colors_impl(TyObject *module); static TyObject * -_curses_has_colors(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_has_colors(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_has_colors_impl(module); } @@ -2487,7 +2487,7 @@ static TyObject * _curses_has_ic_impl(TyObject *module); static TyObject * -_curses_has_ic(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_has_ic(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_has_ic_impl(module); } @@ -2505,7 +2505,7 @@ static TyObject * _curses_has_il_impl(TyObject *module); static TyObject * -_curses_has_il(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_has_il(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_has_il_impl(module); } @@ -2664,7 +2664,7 @@ static TyObject * _curses_initscr_impl(TyObject *module); static TyObject * -_curses_initscr(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_initscr(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_initscr_impl(module); } @@ -2785,7 +2785,7 @@ static TyObject * _curses_get_escdelay_impl(TyObject *module); static TyObject * -_curses_get_escdelay(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_get_escdelay(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_get_escdelay_impl(module); } @@ -2849,7 +2849,7 @@ static TyObject * _curses_get_tabsize_impl(TyObject *module); static TyObject * -_curses_get_tabsize(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_get_tabsize(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_get_tabsize_impl(module); } @@ -2934,7 +2934,7 @@ static TyObject * _curses_isendwin_impl(TyObject *module); static TyObject * -_curses_isendwin(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_isendwin(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_isendwin_impl(module); } @@ -3028,7 +3028,7 @@ static TyObject * _curses_killchar_impl(TyObject *module); static TyObject * -_curses_killchar(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_killchar(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_killchar_impl(module); } @@ -3049,7 +3049,7 @@ static TyObject * _curses_longname_impl(TyObject *module); static TyObject * -_curses_longname(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_longname(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_longname_impl(module); } @@ -3350,7 +3350,7 @@ static TyObject * _curses_nocbreak_impl(TyObject *module); static TyObject * -_curses_nocbreak(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_nocbreak(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_nocbreak_impl(module); } @@ -3370,7 +3370,7 @@ static TyObject * _curses_noecho_impl(TyObject *module); static TyObject * -_curses_noecho(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_noecho(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_noecho_impl(module); } @@ -3391,7 +3391,7 @@ static TyObject * _curses_nonl_impl(TyObject *module); static TyObject * -_curses_nonl(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_nonl(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_nonl_impl(module); } @@ -3412,7 +3412,7 @@ static TyObject * _curses_noqiflush_impl(TyObject *module); static TyObject * -_curses_noqiflush(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_noqiflush(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_noqiflush_impl(module); } @@ -3432,7 +3432,7 @@ static TyObject * _curses_noraw_impl(TyObject *module); static TyObject * -_curses_noraw(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_noraw(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_noraw_impl(module); } @@ -3581,7 +3581,7 @@ static TyObject * _curses_update_lines_cols_impl(TyObject *module); static TyObject * -_curses_update_lines_cols(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_update_lines_cols(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_update_lines_cols_impl(module); } @@ -3643,7 +3643,7 @@ static TyObject * _curses_reset_prog_mode_impl(TyObject *module); static TyObject * -_curses_reset_prog_mode(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_reset_prog_mode(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_reset_prog_mode_impl(module); } @@ -3661,7 +3661,7 @@ static TyObject * _curses_reset_shell_mode_impl(TyObject *module); static TyObject * -_curses_reset_shell_mode(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_reset_shell_mode(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_reset_shell_mode_impl(module); } @@ -3679,7 +3679,7 @@ static TyObject * _curses_resetty_impl(TyObject *module); static TyObject * -_curses_resetty(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_resetty(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_resetty_impl(module); } @@ -3856,7 +3856,7 @@ static TyObject * _curses_savetty_impl(TyObject *module); static TyObject * -_curses_savetty(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_savetty(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_savetty_impl(module); } @@ -3928,7 +3928,7 @@ static TyObject * _curses_start_color_impl(TyObject *module); static TyObject * -_curses_start_color(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_start_color(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_start_color_impl(module); } @@ -3946,7 +3946,7 @@ static TyObject * _curses_termattrs_impl(TyObject *module); static TyObject * -_curses_termattrs(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_termattrs(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_termattrs_impl(module); } @@ -3964,7 +3964,7 @@ static TyObject * _curses_termname_impl(TyObject *module); static TyObject * -_curses_termname(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_termname(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_termname_impl(module); } @@ -4267,7 +4267,7 @@ static TyObject * _curses_use_default_colors_impl(TyObject *module); static TyObject * -_curses_use_default_colors(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_use_default_colors(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_use_default_colors_impl(module); } @@ -4335,7 +4335,7 @@ static TyObject * _curses_has_extended_color_support_impl(TyObject *module); static TyObject * -_curses_has_extended_color_support(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_curses_has_extended_color_support(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _curses_has_extended_color_support_impl(module); } diff --git a/Modules/clinic/_dbmmodule.c.h b/Modules/clinic/_dbmmodule.c.h index 435ad9b..cb278a3 100644 --- a/Modules/clinic/_dbmmodule.c.h +++ b/Modules/clinic/_dbmmodule.c.h @@ -20,7 +20,7 @@ static TyObject * _dbm_dbm_close_impl(dbmobject *self); static TyObject * -_dbm_dbm_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_dbm_dbm_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _dbm_dbm_close_impl((dbmobject *)self); } diff --git a/Modules/clinic/_elementtree.c.h b/Modules/clinic/_elementtree.c.h index f845724..66a2858 100644 --- a/Modules/clinic/_elementtree.c.h +++ b/Modules/clinic/_elementtree.c.h @@ -69,7 +69,7 @@ static TyObject * _elementtree_Element_clear_impl(ElementObject *self); static TyObject * -_elementtree_Element_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_elementtree_Element_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _elementtree_Element_clear_impl((ElementObject *)self); } @@ -135,7 +135,7 @@ static size_t _elementtree_Element___sizeof___impl(ElementObject *self); static TyObject * -_elementtree_Element___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_elementtree_Element___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; size_t _return_value; @@ -162,7 +162,7 @@ static TyObject * _elementtree_Element___getstate___impl(ElementObject *self); static TyObject * -_elementtree_Element___getstate__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_elementtree_Element___getstate__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _elementtree_Element___getstate___impl((ElementObject *)self); } @@ -729,7 +729,7 @@ static TyObject * _elementtree_Element_items_impl(ElementObject *self); static TyObject * -_elementtree_Element_items(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_elementtree_Element_items(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _elementtree_Element_items_impl((ElementObject *)self); } @@ -746,7 +746,7 @@ static TyObject * _elementtree_Element_keys_impl(ElementObject *self); static TyObject * -_elementtree_Element_keys(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_elementtree_Element_keys(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _elementtree_Element_keys_impl((ElementObject *)self); } @@ -1100,7 +1100,7 @@ static TyObject * _elementtree_TreeBuilder_close_impl(TreeBuilderObject *self); static TyObject * -_elementtree_TreeBuilder_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_elementtree_TreeBuilder_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _elementtree_TreeBuilder_close_impl((TreeBuilderObject *)self); } @@ -1232,7 +1232,7 @@ static TyObject * _elementtree_XMLParser_close_impl(XMLParserObject *self); static TyObject * -_elementtree_XMLParser_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_elementtree_XMLParser_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _elementtree_XMLParser_close_impl((XMLParserObject *)self); } @@ -1249,7 +1249,7 @@ static TyObject * _elementtree_XMLParser_flush_impl(XMLParserObject *self); static TyObject * -_elementtree_XMLParser_flush(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_elementtree_XMLParser_flush(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _elementtree_XMLParser_flush_impl((XMLParserObject *)self); } diff --git a/Modules/clinic/_functoolsmodule.c.h b/Modules/clinic/_functoolsmodule.c.h index 4ddeaf0..4dcce11 100644 --- a/Modules/clinic/_functoolsmodule.c.h +++ b/Modules/clinic/_functoolsmodule.c.h @@ -158,7 +158,7 @@ static TyObject * _functools__lru_cache_wrapper_cache_info_impl(TyObject *self); static TyObject * -_functools__lru_cache_wrapper_cache_info(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_functools__lru_cache_wrapper_cache_info(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -182,7 +182,7 @@ static TyObject * _functools__lru_cache_wrapper_cache_clear_impl(TyObject *self); static TyObject * -_functools__lru_cache_wrapper_cache_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_functools__lru_cache_wrapper_cache_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Modules/clinic/_gdbmmodule.c.h b/Modules/clinic/_gdbmmodule.c.h index 67a3ee8..4c9ff19 100644 --- a/Modules/clinic/_gdbmmodule.c.h +++ b/Modules/clinic/_gdbmmodule.c.h @@ -89,7 +89,7 @@ static TyObject * _gdbm_gdbm_close_impl(gdbmobject *self); static TyObject * -_gdbm_gdbm_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_gdbm_gdbm_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _gdbm_gdbm_close_impl((gdbmobject *)self); } diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h index b08a2d8..4a0d6ea 100644 --- a/Modules/clinic/_hashopenssl.c.h +++ b/Modules/clinic/_hashopenssl.c.h @@ -23,7 +23,7 @@ static TyObject * EVP_copy_impl(EVPobject *self); static TyObject * -EVP_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +EVP_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { return EVP_copy_impl((EVPobject *)self); } @@ -41,7 +41,7 @@ static TyObject * EVP_digest_impl(EVPobject *self); static TyObject * -EVP_digest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +EVP_digest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return EVP_digest_impl((EVPobject *)self); } @@ -59,7 +59,7 @@ static TyObject * EVP_hexdigest_impl(EVPobject *self); static TyObject * -EVP_hexdigest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +EVP_hexdigest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return EVP_hexdigest_impl((EVPobject *)self); } @@ -1772,7 +1772,7 @@ static TyObject * _hashlib_HMAC_copy_impl(HMACobject *self); static TyObject * -_hashlib_HMAC_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_hashlib_HMAC_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _hashlib_HMAC_copy_impl((HMACobject *)self); } @@ -1848,7 +1848,7 @@ static TyObject * _hashlib_HMAC_digest_impl(HMACobject *self); static TyObject * -_hashlib_HMAC_digest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_hashlib_HMAC_digest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _hashlib_HMAC_digest_impl((HMACobject *)self); } @@ -1869,7 +1869,7 @@ static TyObject * _hashlib_HMAC_hexdigest_impl(HMACobject *self); static TyObject * -_hashlib_HMAC_hexdigest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_hashlib_HMAC_hexdigest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _hashlib_HMAC_hexdigest_impl((HMACobject *)self); } @@ -1894,7 +1894,7 @@ static int _hashlib_get_fips_mode_impl(TyObject *module); static TyObject * -_hashlib_get_fips_mode(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_hashlib_get_fips_mode(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; diff --git a/Modules/clinic/_localemodule.c.h b/Modules/clinic/_localemodule.c.h index dd8074e..c1cbf8a 100644 --- a/Modules/clinic/_localemodule.c.h +++ b/Modules/clinic/_localemodule.c.h @@ -71,7 +71,7 @@ static TyObject * _locale_localeconv_impl(TyObject *module); static TyObject * -_locale_localeconv(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_locale_localeconv(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _locale_localeconv_impl(module); } @@ -165,7 +165,7 @@ static TyObject * _locale__getdefaultlocale_impl(TyObject *module); static TyObject * -_locale__getdefaultlocale(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_locale__getdefaultlocale(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _locale__getdefaultlocale_impl(module); } @@ -551,7 +551,7 @@ static TyObject * _locale_getencoding_impl(TyObject *module); static TyObject * -_locale_getencoding(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_locale_getencoding(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _locale_getencoding_impl(module); } diff --git a/Modules/clinic/_lsprof.c.h b/Modules/clinic/_lsprof.c.h index 6083926..ad74309 100644 --- a/Modules/clinic/_lsprof.c.h +++ b/Modules/clinic/_lsprof.c.h @@ -318,7 +318,7 @@ static TyObject * _lsprof_Profiler_disable_impl(ProfilerObject *self); static TyObject * -_lsprof_Profiler_disable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_lsprof_Profiler_disable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _lsprof_Profiler_disable_impl((ProfilerObject *)self); } @@ -336,7 +336,7 @@ static TyObject * _lsprof_Profiler_clear_impl(ProfilerObject *self); static TyObject * -_lsprof_Profiler_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_lsprof_Profiler_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _lsprof_Profiler_clear_impl((ProfilerObject *)self); } diff --git a/Modules/clinic/_lzmamodule.c.h b/Modules/clinic/_lzmamodule.c.h index ad8ab5c..fa073ea 100644 --- a/Modules/clinic/_lzmamodule.c.h +++ b/Modules/clinic/_lzmamodule.c.h @@ -63,7 +63,7 @@ static TyObject * _lzma_LZMACompressor_flush_impl(Compressor *self); static TyObject * -_lzma_LZMACompressor_flush(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_lzma_LZMACompressor_flush(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _lzma_LZMACompressor_flush_impl((Compressor *)self); } diff --git a/Modules/clinic/_opcode.c.h b/Modules/clinic/_opcode.c.h index c888ba5..9c21f0d 100644 --- a/Modules/clinic/_opcode.c.h +++ b/Modules/clinic/_opcode.c.h @@ -635,7 +635,7 @@ static TyObject * _opcode_get_specialization_stats_impl(TyObject *module); static TyObject * -_opcode_get_specialization_stats(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_opcode_get_specialization_stats(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _opcode_get_specialization_stats_impl(module); } @@ -655,7 +655,7 @@ static TyObject * _opcode_get_nb_ops_impl(TyObject *module); static TyObject * -_opcode_get_nb_ops(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_opcode_get_nb_ops(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _opcode_get_nb_ops_impl(module); } @@ -673,7 +673,7 @@ static TyObject * _opcode_get_intrinsic1_descs_impl(TyObject *module); static TyObject * -_opcode_get_intrinsic1_descs(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_opcode_get_intrinsic1_descs(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _opcode_get_intrinsic1_descs_impl(module); } @@ -691,7 +691,7 @@ static TyObject * _opcode_get_intrinsic2_descs_impl(TyObject *module); static TyObject * -_opcode_get_intrinsic2_descs(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_opcode_get_intrinsic2_descs(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _opcode_get_intrinsic2_descs_impl(module); } @@ -709,7 +709,7 @@ static TyObject * _opcode_get_special_method_names_impl(TyObject *module); static TyObject * -_opcode_get_special_method_names(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_opcode_get_special_method_names(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _opcode_get_special_method_names_impl(module); } diff --git a/Modules/clinic/_pickle.c.h b/Modules/clinic/_pickle.c.h index 7416828..ff6dd1c 100644 --- a/Modules/clinic/_pickle.c.h +++ b/Modules/clinic/_pickle.c.h @@ -26,7 +26,7 @@ static TyObject * _pickle_Pickler_clear_memo_impl(PicklerObject *self); static TyObject * -_pickle_Pickler_clear_memo(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_pickle_Pickler_clear_memo(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _pickle_Pickler_clear_memo_impl((PicklerObject *)self); } @@ -89,7 +89,7 @@ static size_t _pickle_Pickler___sizeof___impl(PicklerObject *self); static TyObject * -_pickle_Pickler___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_pickle_Pickler___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; size_t _return_value; @@ -229,7 +229,7 @@ static TyObject * _pickle_PicklerMemoProxy_clear_impl(PicklerMemoProxyObject *self); static TyObject * -_pickle_PicklerMemoProxy_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_pickle_PicklerMemoProxy_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _pickle_PicklerMemoProxy_clear_impl((PicklerMemoProxyObject *)self); } @@ -247,7 +247,7 @@ static TyObject * _pickle_PicklerMemoProxy_copy_impl(PicklerMemoProxyObject *self); static TyObject * -_pickle_PicklerMemoProxy_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_pickle_PicklerMemoProxy_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _pickle_PicklerMemoProxy_copy_impl((PicklerMemoProxyObject *)self); } @@ -265,7 +265,7 @@ static TyObject * _pickle_PicklerMemoProxy___reduce___impl(PicklerMemoProxyObject *self); static TyObject * -_pickle_PicklerMemoProxy___reduce__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_pickle_PicklerMemoProxy___reduce__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _pickle_PicklerMemoProxy___reduce___impl((PicklerMemoProxyObject *)self); } @@ -408,7 +408,7 @@ static size_t _pickle_Unpickler___sizeof___impl(UnpicklerObject *self); static TyObject * -_pickle_Unpickler___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_pickle_Unpickler___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; size_t _return_value; @@ -570,7 +570,7 @@ static TyObject * _pickle_UnpicklerMemoProxy_clear_impl(UnpicklerMemoProxyObject *self); static TyObject * -_pickle_UnpicklerMemoProxy_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_pickle_UnpicklerMemoProxy_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _pickle_UnpicklerMemoProxy_clear_impl((UnpicklerMemoProxyObject *)self); } @@ -588,7 +588,7 @@ static TyObject * _pickle_UnpicklerMemoProxy_copy_impl(UnpicklerMemoProxyObject *self); static TyObject * -_pickle_UnpicklerMemoProxy_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_pickle_UnpicklerMemoProxy_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _pickle_UnpicklerMemoProxy_copy_impl((UnpicklerMemoProxyObject *)self); } @@ -606,7 +606,7 @@ static TyObject * _pickle_UnpicklerMemoProxy___reduce___impl(UnpicklerMemoProxyObject *self); static TyObject * -_pickle_UnpicklerMemoProxy___reduce__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_pickle_UnpicklerMemoProxy___reduce__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _pickle_UnpicklerMemoProxy___reduce___impl((UnpicklerMemoProxyObject *)self); } diff --git a/Modules/clinic/_queuemodule.c.h b/Modules/clinic/_queuemodule.c.h index 2a5c2e9..6e0cfab 100644 --- a/Modules/clinic/_queuemodule.c.h +++ b/Modules/clinic/_queuemodule.c.h @@ -312,7 +312,7 @@ static int _queue_SimpleQueue_empty_impl(simplequeueobject *self); static TyObject * -_queue_SimpleQueue_empty(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_queue_SimpleQueue_empty(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -342,7 +342,7 @@ static Ty_ssize_t _queue_SimpleQueue_qsize_impl(simplequeueobject *self); static TyObject * -_queue_SimpleQueue_qsize(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_queue_SimpleQueue_qsize(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; Ty_ssize_t _return_value; diff --git a/Modules/clinic/_randommodule.c.h b/Modules/clinic/_randommodule.c.h index a1b5ff4..d45efac 100644 --- a/Modules/clinic/_randommodule.c.h +++ b/Modules/clinic/_randommodule.c.h @@ -19,7 +19,7 @@ static TyObject * _random_Random_random_impl(RandomObject *self); static TyObject * -_random_Random_random(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_random_Random_random(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -80,7 +80,7 @@ static TyObject * _random_Random_getstate_impl(RandomObject *self); static TyObject * -_random_Random_getstate(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_random_Random_getstate(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Modules/clinic/_remote_debugging_module.c.h b/Modules/clinic/_remote_debugging_module.c.h index e1743a1..47a753f 100644 --- a/Modules/clinic/_remote_debugging_module.c.h +++ b/Modules/clinic/_remote_debugging_module.c.h @@ -163,7 +163,7 @@ static TyObject * _remote_debugging_RemoteUnwinder_get_stack_trace_impl(RemoteUnwinderObject *self); static TyObject * -_remote_debugging_RemoteUnwinder_get_stack_trace(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_remote_debugging_RemoteUnwinder_get_stack_trace(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -220,7 +220,7 @@ static TyObject * _remote_debugging_RemoteUnwinder_get_all_awaited_by_impl(RemoteUnwinderObject *self); static TyObject * -_remote_debugging_RemoteUnwinder_get_all_awaited_by(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_remote_debugging_RemoteUnwinder_get_all_awaited_by(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -278,7 +278,7 @@ static TyObject * _remote_debugging_RemoteUnwinder_get_async_stack_trace_impl(RemoteUnwinderObject *self); static TyObject * -_remote_debugging_RemoteUnwinder_get_async_stack_trace(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_remote_debugging_RemoteUnwinder_get_async_stack_trace(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 714edfa..f2202c8 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -21,7 +21,7 @@ static TyObject * _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_do_handshake(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_do_handshake(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -115,7 +115,7 @@ static TyObject * _ssl__SSLSocket_get_verified_chain_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_get_verified_chain(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_get_verified_chain(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -138,7 +138,7 @@ static TyObject * _ssl__SSLSocket_get_unverified_chain_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_get_unverified_chain(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_get_unverified_chain(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -161,7 +161,7 @@ static TyObject * _ssl__SSLSocket_shared_ciphers_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_shared_ciphers(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_shared_ciphers(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -184,7 +184,7 @@ static TyObject * _ssl__SSLSocket_cipher_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_cipher(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_cipher(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -207,7 +207,7 @@ static TyObject * _ssl__SSLSocket_version_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_version(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_version(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -230,7 +230,7 @@ static TyObject * _ssl__SSLSocket_selected_alpn_protocol_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_selected_alpn_protocol(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_selected_alpn_protocol(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -253,7 +253,7 @@ static TyObject * _ssl__SSLSocket_compression_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_compression(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_compression(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _ssl__SSLSocket_compression_impl((PySSLSocket *)self); } @@ -283,7 +283,7 @@ static TyObject * _ssl__SSLSocket_context_get_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_context_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLSocket_context_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -308,7 +308,7 @@ static int _ssl__SSLSocket_context_set_impl(PySSLSocket *self, TyObject *value); static int -_ssl__SSLSocket_context_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLSocket_context_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -340,7 +340,7 @@ static TyObject * _ssl__SSLSocket_server_side_get_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_server_side_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLSocket_server_side_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -372,7 +372,7 @@ static TyObject * _ssl__SSLSocket_server_hostname_get_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_server_hostname_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLSocket_server_hostname_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -406,7 +406,7 @@ static TyObject * _ssl__SSLSocket_owner_get_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_owner_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLSocket_owner_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -431,7 +431,7 @@ static int _ssl__SSLSocket_owner_set_impl(PySSLSocket *self, TyObject *value); static int -_ssl__SSLSocket_owner_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLSocket_owner_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -491,7 +491,7 @@ static TyObject * _ssl__SSLSocket_pending_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_pending(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_pending(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -563,7 +563,7 @@ static TyObject * _ssl__SSLSocket_shutdown_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_shutdown(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_shutdown(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -669,7 +669,7 @@ static TyObject * _ssl__SSLSocket_verify_client_post_handshake_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_verify_client_post_handshake(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLSocket_verify_client_post_handshake(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -701,7 +701,7 @@ static TyObject * _ssl__SSLSocket_session_get_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_session_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLSocket_session_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -726,7 +726,7 @@ static int _ssl__SSLSocket_session_set_impl(PySSLSocket *self, TyObject *value); static int -_ssl__SSLSocket_session_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLSocket_session_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -758,7 +758,7 @@ static TyObject * _ssl__SSLSocket_session_reused_get_impl(PySSLSocket *self); static TyObject * -_ssl__SSLSocket_session_reused_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLSocket_session_reused_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -848,7 +848,7 @@ static TyObject * _ssl__SSLContext_get_ciphers_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_get_ciphers(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLContext_get_ciphers(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -907,7 +907,7 @@ static TyObject * _ssl__SSLContext_verify_mode_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_verify_mode_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_verify_mode_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -932,7 +932,7 @@ static int _ssl__SSLContext_verify_mode_set_impl(PySSLContext *self, TyObject *value); static int -_ssl__SSLContext_verify_mode_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLContext_verify_mode_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -957,7 +957,7 @@ static TyObject * _ssl__SSLContext_verify_flags_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_verify_flags_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_verify_flags_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -982,7 +982,7 @@ static int _ssl__SSLContext_verify_flags_set_impl(PySSLContext *self, TyObject *value); static int -_ssl__SSLContext_verify_flags_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLContext_verify_flags_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -1007,7 +1007,7 @@ static TyObject * _ssl__SSLContext_minimum_version_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_minimum_version_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_minimum_version_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1033,7 +1033,7 @@ _ssl__SSLContext_minimum_version_set_impl(PySSLContext *self, TyObject *value); static int -_ssl__SSLContext_minimum_version_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLContext_minimum_version_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -1058,7 +1058,7 @@ static TyObject * _ssl__SSLContext_maximum_version_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_maximum_version_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_maximum_version_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1084,7 +1084,7 @@ _ssl__SSLContext_maximum_version_set_impl(PySSLContext *self, TyObject *value); static int -_ssl__SSLContext_maximum_version_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLContext_maximum_version_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -1116,7 +1116,7 @@ static TyObject * _ssl__SSLContext_num_tickets_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_num_tickets_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_num_tickets_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1141,7 +1141,7 @@ static int _ssl__SSLContext_num_tickets_set_impl(PySSLContext *self, TyObject *value); static int -_ssl__SSLContext_num_tickets_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLContext_num_tickets_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -1173,7 +1173,7 @@ static TyObject * _ssl__SSLContext_security_level_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_security_level_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_security_level_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1198,7 +1198,7 @@ static TyObject * _ssl__SSLContext_options_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_options_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_options_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1223,7 +1223,7 @@ static int _ssl__SSLContext_options_set_impl(PySSLContext *self, TyObject *value); static int -_ssl__SSLContext_options_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLContext_options_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -1248,7 +1248,7 @@ static TyObject * _ssl__SSLContext__host_flags_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext__host_flags_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext__host_flags_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1273,7 +1273,7 @@ static int _ssl__SSLContext__host_flags_set_impl(PySSLContext *self, TyObject *value); static int -_ssl__SSLContext__host_flags_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLContext__host_flags_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -1298,7 +1298,7 @@ static TyObject * _ssl__SSLContext_check_hostname_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_check_hostname_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_check_hostname_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1323,7 +1323,7 @@ static int _ssl__SSLContext_check_hostname_set_impl(PySSLContext *self, TyObject *value); static int -_ssl__SSLContext_check_hostname_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLContext_check_hostname_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -1348,7 +1348,7 @@ static TyObject * _ssl__SSLContext_protocol_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_protocol_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_protocol_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1748,7 +1748,7 @@ static TyObject * _ssl__SSLContext_session_stats_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_session_stats(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLContext_session_stats(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1771,7 +1771,7 @@ static TyObject * _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_set_default_verify_paths(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLContext_set_default_verify_paths(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1831,7 +1831,7 @@ static TyObject * _ssl__SSLContext_sni_callback_get_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_sni_callback_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl__SSLContext_sni_callback_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -1856,7 +1856,7 @@ static int _ssl__SSLContext_sni_callback_set_impl(PySSLContext *self, TyObject *value); static int -_ssl__SSLContext_sni_callback_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +_ssl__SSLContext_sni_callback_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -1886,7 +1886,7 @@ static TyObject * _ssl__SSLContext_cert_store_stats_impl(PySSLContext *self); static TyObject * -_ssl__SSLContext_cert_store_stats(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl__SSLContext_cert_store_stats(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -2162,7 +2162,7 @@ static TyObject * _ssl_MemoryBIO_pending_get_impl(PySSLMemoryBIO *self); static TyObject * -_ssl_MemoryBIO_pending_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl_MemoryBIO_pending_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -2194,7 +2194,7 @@ static TyObject * _ssl_MemoryBIO_eof_get_impl(PySSLMemoryBIO *self); static TyObject * -_ssl_MemoryBIO_eof_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl_MemoryBIO_eof_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -2298,7 +2298,7 @@ static TyObject * _ssl_MemoryBIO_write_eof_impl(PySSLMemoryBIO *self); static TyObject * -_ssl_MemoryBIO_write_eof(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_ssl_MemoryBIO_write_eof(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -2330,7 +2330,7 @@ static TyObject * _ssl_SSLSession_time_get_impl(PySSLSession *self); static TyObject * -_ssl_SSLSession_time_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl_SSLSession_time_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -2362,7 +2362,7 @@ static TyObject * _ssl_SSLSession_timeout_get_impl(PySSLSession *self); static TyObject * -_ssl_SSLSession_timeout_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl_SSLSession_timeout_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -2394,7 +2394,7 @@ static TyObject * _ssl_SSLSession_ticket_lifetime_hint_get_impl(PySSLSession *self); static TyObject * -_ssl_SSLSession_ticket_lifetime_hint_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl_SSLSession_ticket_lifetime_hint_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -2426,7 +2426,7 @@ static TyObject * _ssl_SSLSession_id_get_impl(PySSLSession *self); static TyObject * -_ssl_SSLSession_id_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl_SSLSession_id_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -2458,7 +2458,7 @@ static TyObject * _ssl_SSLSession_has_ticket_get_impl(PySSLSession *self); static TyObject * -_ssl_SSLSession_has_ticket_get(TyObject *self, void *Ty_UNUSED(context)) +_ssl_SSLSession_has_ticket_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -2578,7 +2578,7 @@ static TyObject * _ssl_RAND_status_impl(TyObject *module); static TyObject * -_ssl_RAND_status(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_ssl_RAND_status(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -2604,7 +2604,7 @@ static TyObject * _ssl_get_default_verify_paths_impl(TyObject *module); static TyObject * -_ssl_get_default_verify_paths(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_ssl_get_default_verify_paths(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Modules/clinic/_struct.c.h b/Modules/clinic/_struct.c.h index 433fe1b..3b6ccb7 100644 --- a/Modules/clinic/_struct.c.h +++ b/Modules/clinic/_struct.c.h @@ -239,7 +239,7 @@ static TyObject * _clearcache_impl(TyObject *module); static TyObject * -_clearcache(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_clearcache(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _clearcache_impl(module); } diff --git a/Modules/clinic/_sysconfig.c.h b/Modules/clinic/_sysconfig.c.h index c6e8151..7510042 100644 --- a/Modules/clinic/_sysconfig.c.h +++ b/Modules/clinic/_sysconfig.c.h @@ -15,7 +15,7 @@ static TyObject * _sysconfig_config_vars_impl(TyObject *module); static TyObject * -_sysconfig_config_vars(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_sysconfig_config_vars(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _sysconfig_config_vars_impl(module); } diff --git a/Modules/clinic/_testclinic.c.h b/Modules/clinic/_testclinic.c.h index a9978c8..d61455e 100644 --- a/Modules/clinic/_testclinic.c.h +++ b/Modules/clinic/_testclinic.c.h @@ -23,7 +23,7 @@ static TyObject * test_empty_function_impl(TyObject *module); static TyObject * -test_empty_function(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_empty_function(TyObject *module, TyObject *Py_UNUSED(ignored)) { return test_empty_function_impl(module); } diff --git a/Modules/clinic/_testclinic_limited.c.h b/Modules/clinic/_testclinic_limited.c.h index b7abde0..ca82c63 100644 --- a/Modules/clinic/_testclinic_limited.c.h +++ b/Modules/clinic/_testclinic_limited.c.h @@ -14,7 +14,7 @@ static TyObject * test_empty_function_impl(TyObject *module); static TyObject * -test_empty_function(TyObject *module, TyObject *Ty_UNUSED(ignored)) +test_empty_function(TyObject *module, TyObject *Py_UNUSED(ignored)) { return test_empty_function_impl(module); } diff --git a/Modules/clinic/_testinternalcapi.c.h b/Modules/clinic/_testinternalcapi.c.h index e03887d..fda206e 100644 --- a/Modules/clinic/_testinternalcapi.c.h +++ b/Modules/clinic/_testinternalcapi.c.h @@ -83,7 +83,7 @@ static TyObject * _testinternalcapi_new_instruction_sequence_impl(TyObject *module); static TyObject * -_testinternalcapi_new_instruction_sequence(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testinternalcapi_new_instruction_sequence(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testinternalcapi_new_instruction_sequence_impl(module); } @@ -308,7 +308,7 @@ static TyObject * _testinternalcapi_test_long_numbits_impl(TyObject *module); static TyObject * -_testinternalcapi_test_long_numbits(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_testinternalcapi_test_long_numbits(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _testinternalcapi_test_long_numbits_impl(module); } @@ -388,7 +388,7 @@ static TyObject * get_next_dict_keys_version_impl(TyObject *module); static TyObject * -get_next_dict_keys_version(TyObject *module, TyObject *Ty_UNUSED(ignored)) +get_next_dict_keys_version(TyObject *module, TyObject *Py_UNUSED(ignored)) { return get_next_dict_keys_version_impl(module); } diff --git a/Modules/clinic/_threadmodule.c.h b/Modules/clinic/_threadmodule.c.h index cb2d655..f413efc 100644 --- a/Modules/clinic/_threadmodule.c.h +++ b/Modules/clinic/_threadmodule.c.h @@ -23,7 +23,7 @@ static TyObject * _thread__get_name_impl(TyObject *module); static TyObject * -_thread__get_name(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_thread__get_name(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _thread__get_name_impl(module); } diff --git a/Modules/clinic/_tkinter.c.h b/Modules/clinic/_tkinter.c.h index 4239d27..9d875dc 100644 --- a/Modules/clinic/_tkinter.c.h +++ b/Modules/clinic/_tkinter.c.h @@ -530,7 +530,7 @@ static TyObject * _tkinter_tktimertoken_deletetimerhandler_impl(TkttObject *self); static TyObject * -_tkinter_tktimertoken_deletetimerhandler(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_tkinter_tktimertoken_deletetimerhandler(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _tkinter_tktimertoken_deletetimerhandler_impl((TkttObject *)self); } @@ -648,7 +648,7 @@ static TyObject * _tkinter_tkapp_quit_impl(TkappObject *self); static TyObject * -_tkinter_tkapp_quit(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_tkinter_tkapp_quit(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _tkinter_tkapp_quit_impl((TkappObject *)self); } @@ -665,7 +665,7 @@ static TyObject * _tkinter_tkapp_interpaddr_impl(TkappObject *self); static TyObject * -_tkinter_tkapp_interpaddr(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_tkinter_tkapp_interpaddr(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _tkinter_tkapp_interpaddr_impl((TkappObject *)self); } @@ -682,7 +682,7 @@ static TyObject * _tkinter_tkapp_loadtk_impl(TkappObject *self); static TyObject * -_tkinter_tkapp_loadtk(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_tkinter_tkapp_loadtk(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _tkinter_tkapp_loadtk_impl((TkappObject *)self); } @@ -722,7 +722,7 @@ static TyObject * _tkinter_tkapp_gettrace_impl(TkappObject *self); static TyObject * -_tkinter_tkapp_gettrace(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_tkinter_tkapp_gettrace(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _tkinter_tkapp_gettrace_impl((TkappObject *)self); } @@ -739,7 +739,7 @@ static TyObject * _tkinter_tkapp_willdispatch_impl(TkappObject *self); static TyObject * -_tkinter_tkapp_willdispatch(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_tkinter_tkapp_willdispatch(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _tkinter_tkapp_willdispatch_impl((TkappObject *)self); } @@ -944,7 +944,7 @@ static int _tkinter_getbusywaitinterval_impl(TyObject *module); static TyObject * -_tkinter_getbusywaitinterval(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_tkinter_getbusywaitinterval(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; diff --git a/Modules/clinic/_tracemalloc.c.h b/Modules/clinic/_tracemalloc.c.h index a6bb5f8..288efa7 100644 --- a/Modules/clinic/_tracemalloc.c.h +++ b/Modules/clinic/_tracemalloc.c.h @@ -17,7 +17,7 @@ static TyObject * _tracemalloc_is_tracing_impl(TyObject *module); static TyObject * -_tracemalloc_is_tracing(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_tracemalloc_is_tracing(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _tracemalloc_is_tracing_impl(module); } @@ -35,7 +35,7 @@ static TyObject * _tracemalloc_clear_traces_impl(TyObject *module); static TyObject * -_tracemalloc_clear_traces(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_tracemalloc_clear_traces(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _tracemalloc_clear_traces_impl(module); } @@ -58,7 +58,7 @@ static TyObject * _tracemalloc__get_traces_impl(TyObject *module); static TyObject * -_tracemalloc__get_traces(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_tracemalloc__get_traces(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _tracemalloc__get_traces_impl(module); } @@ -129,7 +129,7 @@ static TyObject * _tracemalloc_stop_impl(TyObject *module); static TyObject * -_tracemalloc_stop(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_tracemalloc_stop(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _tracemalloc_stop_impl(module); } @@ -150,7 +150,7 @@ static TyObject * _tracemalloc_get_traceback_limit_impl(TyObject *module); static TyObject * -_tracemalloc_get_traceback_limit(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_tracemalloc_get_traceback_limit(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _tracemalloc_get_traceback_limit_impl(module); } @@ -170,7 +170,7 @@ static TyObject * _tracemalloc_get_tracemalloc_memory_impl(TyObject *module); static TyObject * -_tracemalloc_get_tracemalloc_memory(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_tracemalloc_get_tracemalloc_memory(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _tracemalloc_get_tracemalloc_memory_impl(module); } @@ -190,7 +190,7 @@ static TyObject * _tracemalloc_get_traced_memory_impl(TyObject *module); static TyObject * -_tracemalloc_get_traced_memory(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_tracemalloc_get_traced_memory(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _tracemalloc_get_traced_memory_impl(module); } @@ -210,7 +210,7 @@ static TyObject * _tracemalloc_reset_peak_impl(TyObject *module); static TyObject * -_tracemalloc_reset_peak(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_tracemalloc_reset_peak(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _tracemalloc_reset_peak_impl(module); } diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h index 5ea3c95..db279de 100644 --- a/Modules/clinic/_winapi.c.h +++ b/Modules/clinic/_winapi.c.h @@ -48,7 +48,7 @@ static TyObject * _winapi_Overlapped_getbuffer_impl(OverlappedObject *self); static TyObject * -_winapi_Overlapped_getbuffer(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_winapi_Overlapped_getbuffer(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _winapi_Overlapped_getbuffer_impl((OverlappedObject *)self); } @@ -65,7 +65,7 @@ static TyObject * _winapi_Overlapped_cancel_impl(OverlappedObject *self); static TyObject * -_winapi_Overlapped_cancel(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_winapi_Overlapped_cancel(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _winapi_Overlapped_cancel_impl((OverlappedObject *)self); } @@ -214,7 +214,7 @@ _winapi_CreateEventW(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -264,7 +264,7 @@ _winapi_CreateFile(TyObject *module, TyObject *const *args, Ty_ssize_t nargs) goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -311,7 +311,7 @@ _winapi_CreateFileMapping(TyObject *module, TyObject *const *args, Ty_ssize_t na goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -429,7 +429,7 @@ _winapi_CreateMutexW(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -480,7 +480,7 @@ _winapi_CreateNamedPipe(TyObject *module, TyObject *const *args, Ty_ssize_t narg goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -626,7 +626,7 @@ _winapi_DuplicateHandle(TyObject *module, TyObject *const *args, Ty_ssize_t narg goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -673,7 +673,7 @@ static HANDLE _winapi_GetCurrentProcess_impl(TyObject *module); static TyObject * -_winapi_GetCurrentProcess(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_winapi_GetCurrentProcess(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; HANDLE _return_value; @@ -683,7 +683,7 @@ _winapi_GetCurrentProcess(TyObject *module, TyObject *Ty_UNUSED(ignored)) goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -735,7 +735,7 @@ static DWORD _winapi_GetLastError_impl(TyObject *module); static TyObject * -_winapi_GetLastError(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_winapi_GetLastError(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; DWORD _return_value; @@ -962,7 +962,7 @@ _winapi_GetStdHandle(TyObject *module, TyObject *arg) goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -983,7 +983,7 @@ static long _winapi_GetVersion_impl(TyObject *module); static TyObject * -_winapi_GetVersion(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_winapi_GetVersion(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; long _return_value; @@ -1120,7 +1120,7 @@ _winapi_OpenEventW(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, Ty goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -1188,7 +1188,7 @@ _winapi_OpenMutexW(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, Ty goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -1229,7 +1229,7 @@ _winapi_OpenFileMapping(TyObject *module, TyObject *const *args, Ty_ssize_t narg goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -1270,7 +1270,7 @@ _winapi_OpenProcess(TyObject *module, TyObject *const *args, Ty_ssize_t nargs) goto exit; } if (_return_value == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return_value = HANDLE_TO_PYNUM(_return_value); @@ -1924,7 +1924,7 @@ static TyObject * _winapi_GetACP_impl(TyObject *module); static TyObject * -_winapi_GetACP(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_winapi_GetACP(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _winapi_GetACP_impl(module); } diff --git a/Modules/clinic/arraymodule.c.h b/Modules/clinic/arraymodule.c.h index 701163d..dfb9713 100644 --- a/Modules/clinic/arraymodule.c.h +++ b/Modules/clinic/arraymodule.c.h @@ -21,7 +21,7 @@ static TyObject * array_array_clear_impl(arrayobject *self); static TyObject * -array_array_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +array_array_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { return array_array_clear_impl((arrayobject *)self); } @@ -39,7 +39,7 @@ static TyObject * array_array___copy___impl(arrayobject *self); static TyObject * -array_array___copy__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +array_array___copy__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return array_array___copy___impl((arrayobject *)self); } @@ -302,7 +302,7 @@ static TyObject * array_array_buffer_info_impl(arrayobject *self); static TyObject * -array_array_buffer_info(TyObject *self, TyObject *Ty_UNUSED(ignored)) +array_array_buffer_info(TyObject *self, TyObject *Py_UNUSED(ignored)) { return array_array_buffer_info_impl((arrayobject *)self); } @@ -345,7 +345,7 @@ static TyObject * array_array_byteswap_impl(arrayobject *self); static TyObject * -array_array_byteswap(TyObject *self, TyObject *Ty_UNUSED(ignored)) +array_array_byteswap(TyObject *self, TyObject *Py_UNUSED(ignored)) { return array_array_byteswap_impl((arrayobject *)self); } @@ -363,7 +363,7 @@ static TyObject * array_array_reverse_impl(arrayobject *self); static TyObject * -array_array_reverse(TyObject *self, TyObject *Ty_UNUSED(ignored)) +array_array_reverse(TyObject *self, TyObject *Py_UNUSED(ignored)) { return array_array_reverse_impl((arrayobject *)self); } @@ -505,7 +505,7 @@ static TyObject * array_array_tolist_impl(arrayobject *self); static TyObject * -array_array_tolist(TyObject *self, TyObject *Ty_UNUSED(ignored)) +array_array_tolist(TyObject *self, TyObject *Py_UNUSED(ignored)) { return array_array_tolist_impl((arrayobject *)self); } @@ -555,7 +555,7 @@ static TyObject * array_array_tobytes_impl(arrayobject *self); static TyObject * -array_array_tobytes(TyObject *self, TyObject *Ty_UNUSED(ignored)) +array_array_tobytes(TyObject *self, TyObject *Py_UNUSED(ignored)) { return array_array_tobytes_impl((arrayobject *)self); } @@ -610,7 +610,7 @@ static TyObject * array_array_tounicode_impl(arrayobject *self); static TyObject * -array_array_tounicode(TyObject *self, TyObject *Ty_UNUSED(ignored)) +array_array_tounicode(TyObject *self, TyObject *Py_UNUSED(ignored)) { return array_array_tounicode_impl((arrayobject *)self); } @@ -628,7 +628,7 @@ static TyObject * array_array___sizeof___impl(arrayobject *self); static TyObject * -array_array___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +array_array___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return array_array___sizeof___impl((arrayobject *)self); } diff --git a/Modules/clinic/blake2module.c.h b/Modules/clinic/blake2module.c.h index 3c406e1..e0eaa89 100644 --- a/Modules/clinic/blake2module.c.h +++ b/Modules/clinic/blake2module.c.h @@ -440,7 +440,7 @@ static TyObject * _blake2_blake2b_copy_impl(Blake2Object *self); static TyObject * -_blake2_blake2b_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_blake2_blake2b_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _blake2_blake2b_copy_impl((Blake2Object *)self); } @@ -480,7 +480,7 @@ static TyObject * _blake2_blake2b_digest_impl(Blake2Object *self); static TyObject * -_blake2_blake2b_digest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_blake2_blake2b_digest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _blake2_blake2b_digest_impl((Blake2Object *)self); } @@ -498,7 +498,7 @@ static TyObject * _blake2_blake2b_hexdigest_impl(Blake2Object *self); static TyObject * -_blake2_blake2b_hexdigest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_blake2_blake2b_hexdigest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _blake2_blake2b_hexdigest_impl((Blake2Object *)self); } diff --git a/Modules/clinic/gcmodule.c.h b/Modules/clinic/gcmodule.c.h index 05ddef8..f843f5c 100644 --- a/Modules/clinic/gcmodule.c.h +++ b/Modules/clinic/gcmodule.c.h @@ -23,7 +23,7 @@ static TyObject * gc_enable_impl(TyObject *module); static TyObject * -gc_enable(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_enable(TyObject *module, TyObject *Py_UNUSED(ignored)) { return gc_enable_impl(module); } @@ -41,7 +41,7 @@ static TyObject * gc_disable_impl(TyObject *module); static TyObject * -gc_disable(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_disable(TyObject *module, TyObject *Py_UNUSED(ignored)) { return gc_disable_impl(module); } @@ -59,7 +59,7 @@ static int gc_isenabled_impl(TyObject *module); static TyObject * -gc_isenabled(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_isenabled(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -203,7 +203,7 @@ static int gc_get_debug_impl(TyObject *module); static TyObject * -gc_get_debug(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_get_debug(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -283,7 +283,7 @@ static TyObject * gc_get_threshold_impl(TyObject *module); static TyObject * -gc_get_threshold(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_get_threshold(TyObject *module, TyObject *Py_UNUSED(ignored)) { return gc_get_threshold_impl(module); } @@ -301,7 +301,7 @@ static TyObject * gc_get_count_impl(TyObject *module); static TyObject * -gc_get_count(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_get_count(TyObject *module, TyObject *Py_UNUSED(ignored)) { return gc_get_count_impl(module); } @@ -452,7 +452,7 @@ static TyObject * gc_get_stats_impl(TyObject *module); static TyObject * -gc_get_stats(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_get_stats(TyObject *module, TyObject *Py_UNUSED(ignored)) { return gc_get_stats_impl(module); } @@ -532,7 +532,7 @@ static TyObject * gc_freeze_impl(TyObject *module); static TyObject * -gc_freeze(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_freeze(TyObject *module, TyObject *Py_UNUSED(ignored)) { return gc_freeze_impl(module); } @@ -552,7 +552,7 @@ static TyObject * gc_unfreeze_impl(TyObject *module); static TyObject * -gc_unfreeze(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_unfreeze(TyObject *module, TyObject *Py_UNUSED(ignored)) { return gc_unfreeze_impl(module); } @@ -570,7 +570,7 @@ static Ty_ssize_t gc_get_freeze_count_impl(TyObject *module); static TyObject * -gc_get_freeze_count(TyObject *module, TyObject *Ty_UNUSED(ignored)) +gc_get_freeze_count(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; Ty_ssize_t _return_value; diff --git a/Modules/clinic/grpmodule.c.h b/Modules/clinic/grpmodule.c.h index 6049d6f..1b7e844 100644 --- a/Modules/clinic/grpmodule.c.h +++ b/Modules/clinic/grpmodule.c.h @@ -148,7 +148,7 @@ static TyObject * grp_getgrall_impl(TyObject *module); static TyObject * -grp_getgrall(TyObject *module, TyObject *Ty_UNUSED(ignored)) +grp_getgrall(TyObject *module, TyObject *Py_UNUSED(ignored)) { return grp_getgrall_impl(module); } diff --git a/Modules/clinic/hmacmodule.c.h b/Modules/clinic/hmacmodule.c.h index 8c5c3f2..24952cb 100644 --- a/Modules/clinic/hmacmodule.c.h +++ b/Modules/clinic/hmacmodule.c.h @@ -176,7 +176,7 @@ static TyObject * _hmac_HMAC_digest_impl(HMACObject *self); static TyObject * -_hmac_HMAC_digest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_hmac_HMAC_digest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _hmac_HMAC_digest_impl((HMACObject *)self); } @@ -199,7 +199,7 @@ static TyObject * _hmac_HMAC_hexdigest_impl(HMACObject *self); static TyObject * -_hmac_HMAC_hexdigest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_hmac_HMAC_hexdigest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _hmac_HMAC_hexdigest_impl((HMACObject *)self); } @@ -218,7 +218,7 @@ static TyObject * _hmac_HMAC_name_get_impl(HMACObject *self); static TyObject * -_hmac_HMAC_name_get(TyObject *self, void *Ty_UNUSED(context)) +_hmac_HMAC_name_get(TyObject *self, void *Py_UNUSED(context)) { return _hmac_HMAC_name_get_impl((HMACObject *)self); } @@ -237,7 +237,7 @@ static TyObject * _hmac_HMAC_block_size_get_impl(HMACObject *self); static TyObject * -_hmac_HMAC_block_size_get(TyObject *self, void *Ty_UNUSED(context)) +_hmac_HMAC_block_size_get(TyObject *self, void *Py_UNUSED(context)) { return _hmac_HMAC_block_size_get_impl((HMACObject *)self); } @@ -256,7 +256,7 @@ static TyObject * _hmac_HMAC_digest_size_get_impl(HMACObject *self); static TyObject * -_hmac_HMAC_digest_size_get(TyObject *self, void *Ty_UNUSED(context)) +_hmac_HMAC_digest_size_get(TyObject *self, void *Py_UNUSED(context)) { return _hmac_HMAC_digest_size_get_impl((HMACObject *)self); } diff --git a/Modules/clinic/overlapped.c.h b/Modules/clinic/overlapped.c.h index c631ba7..5d31c1e 100644 --- a/Modules/clinic/overlapped.c.h +++ b/Modules/clinic/overlapped.c.h @@ -518,7 +518,7 @@ static TyObject * _overlapped_Overlapped_cancel_impl(OverlappedObject *self); static TyObject * -_overlapped_Overlapped_cancel(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_overlapped_Overlapped_cancel(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _overlapped_Overlapped_cancel_impl((OverlappedObject *)self); } diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h index 2d722e7..db7576d 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -365,7 +365,7 @@ static TyObject * os_ctermid_impl(TyObject *module); static TyObject * -os_ctermid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_ctermid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_ctermid_impl(module); } @@ -1087,7 +1087,7 @@ static TyObject * os_sync_impl(TyObject *module); static TyObject * -os_sync(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_sync(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_sync_impl(module); } @@ -1444,7 +1444,7 @@ static TyObject * os_getcwd_impl(TyObject *module); static TyObject * -os_getcwd(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getcwd(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getcwd_impl(module); } @@ -1462,7 +1462,7 @@ static TyObject * os_getcwdb_impl(TyObject *module); static TyObject * -os_getcwdb(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getcwdb(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getcwdb_impl(module); } @@ -1676,7 +1676,7 @@ static TyObject * os_listdrives_impl(TyObject *module); static TyObject * -os_listdrives(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_listdrives(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_listdrives_impl(module); } @@ -1700,7 +1700,7 @@ static TyObject * os_listvolumes_impl(TyObject *module); static TyObject * -os_listvolumes(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_listvolumes(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_listvolumes_impl(module); } @@ -3527,7 +3527,7 @@ static TyObject * os_uname_impl(TyObject *module); static TyObject * -os_uname(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_uname(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_uname_impl(module); } @@ -4365,7 +4365,7 @@ static TyObject * os_fork1_impl(TyObject *module); static TyObject * -os_fork1(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_fork1(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_fork1_impl(module); } @@ -4389,7 +4389,7 @@ static TyObject * os_fork_impl(TyObject *module); static TyObject * -os_fork(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_fork(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_fork_impl(module); } @@ -4799,7 +4799,7 @@ static TyObject * os_sched_yield_impl(TyObject *module); static TyObject * -os_sched_yield(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_sched_yield(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_sched_yield_impl(module); } @@ -5050,7 +5050,7 @@ static TyObject * os_openpty_impl(TyObject *module); static TyObject * -os_openpty(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_openpty(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_openpty_impl(module); } @@ -5113,7 +5113,7 @@ static TyObject * os_forkpty_impl(TyObject *module); static TyObject * -os_forkpty(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_forkpty(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_forkpty_impl(module); } @@ -5135,7 +5135,7 @@ static TyObject * os_getegid_impl(TyObject *module); static TyObject * -os_getegid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getegid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getegid_impl(module); } @@ -5157,7 +5157,7 @@ static TyObject * os_geteuid_impl(TyObject *module); static TyObject * -os_geteuid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_geteuid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_geteuid_impl(module); } @@ -5179,7 +5179,7 @@ static TyObject * os_getgid_impl(TyObject *module); static TyObject * -os_getgid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getgid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getgid_impl(module); } @@ -5201,7 +5201,7 @@ static TyObject * os_getpid_impl(TyObject *module); static TyObject * -os_getpid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getpid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getpid_impl(module); } @@ -5330,7 +5330,7 @@ static TyObject * os_getgroups_impl(TyObject *module); static TyObject * -os_getgroups(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getgroups(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getgroups_impl(module); } @@ -5508,7 +5508,7 @@ static TyObject * os_getpgrp_impl(TyObject *module); static TyObject * -os_getpgrp(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getpgrp(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getpgrp_impl(module); } @@ -5530,7 +5530,7 @@ static TyObject * os_setpgrp_impl(TyObject *module); static TyObject * -os_setpgrp(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_setpgrp(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_setpgrp_impl(module); } @@ -5555,7 +5555,7 @@ static TyObject * os_getppid_impl(TyObject *module); static TyObject * -os_getppid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getppid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getppid_impl(module); } @@ -5577,7 +5577,7 @@ static TyObject * os_getlogin_impl(TyObject *module); static TyObject * -os_getlogin(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getlogin(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getlogin_impl(module); } @@ -5599,7 +5599,7 @@ static TyObject * os_getuid_impl(TyObject *module); static TyObject * -os_getuid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getuid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getuid_impl(module); } @@ -6243,7 +6243,7 @@ static TyObject * os_wait_impl(TyObject *module); static TyObject * -os_wait(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_wait(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_wait_impl(module); } @@ -6681,7 +6681,7 @@ static TyObject * os_times_impl(TyObject *module); static TyObject * -os_times(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_times(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_times_impl(module); } @@ -7116,7 +7116,7 @@ static TyObject * os_setsid_impl(TyObject *module); static TyObject * -os_setsid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_setsid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_setsid_impl(module); } @@ -8447,7 +8447,7 @@ static TyObject * os_pipe_impl(TyObject *module); static TyObject * -os_pipe(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_pipe(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_pipe_impl(module); } @@ -10524,7 +10524,7 @@ static TyObject * os_abort_impl(TyObject *module); static TyObject * -os_abort(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_abort(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_abort_impl(module); } @@ -10696,7 +10696,7 @@ static TyObject * os_getloadavg_impl(TyObject *module); static TyObject * -os_getloadavg(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getloadavg(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getloadavg_impl(module); } @@ -10866,7 +10866,7 @@ static TyObject * os_getresuid_impl(TyObject *module); static TyObject * -os_getresuid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getresuid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getresuid_impl(module); } @@ -10888,7 +10888,7 @@ static TyObject * os_getresgid_impl(TyObject *module); static TyObject * -os_getresgid(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_getresgid(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_getresgid_impl(module); } @@ -11663,7 +11663,7 @@ static TyObject * os_cpu_count_impl(TyObject *module); static TyObject * -os_cpu_count(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os_cpu_count(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os_cpu_count_impl(module); } @@ -11934,7 +11934,7 @@ static int os_DirEntry_is_junction_impl(DirEntry *self); static TyObject * -os_DirEntry_is_junction(TyObject *self, TyObject *Ty_UNUSED(ignored)) +os_DirEntry_is_junction(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -12173,7 +12173,7 @@ static TyObject * os_DirEntry_inode_impl(DirEntry *self); static TyObject * -os_DirEntry_inode(TyObject *self, TyObject *Ty_UNUSED(ignored)) +os_DirEntry_inode(TyObject *self, TyObject *Py_UNUSED(ignored)) { return os_DirEntry_inode_impl((DirEntry *)self); } @@ -12191,7 +12191,7 @@ static TyObject * os_DirEntry___fspath___impl(DirEntry *self); static TyObject * -os_DirEntry___fspath__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +os_DirEntry___fspath__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return os_DirEntry___fspath___impl((DirEntry *)self); } @@ -12644,7 +12644,7 @@ static TyObject * os__supports_virtual_terminal_impl(TyObject *module); static TyObject * -os__supports_virtual_terminal(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os__supports_virtual_terminal(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os__supports_virtual_terminal_impl(module); } @@ -12664,7 +12664,7 @@ static TyObject * os__inputhook_impl(TyObject *module); static TyObject * -os__inputhook(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os__inputhook(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os__inputhook_impl(module); } @@ -12682,7 +12682,7 @@ static TyObject * os__is_inputhook_installed_impl(TyObject *module); static TyObject * -os__is_inputhook_installed(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os__is_inputhook_installed(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os__is_inputhook_installed_impl(module); } @@ -12700,7 +12700,7 @@ static TyObject * os__create_environ_impl(TyObject *module); static TyObject * -os__create_environ(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os__create_environ(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os__create_environ_impl(module); } @@ -12720,7 +12720,7 @@ static TyObject * os__emscripten_debugger_impl(TyObject *module); static TyObject * -os__emscripten_debugger(TyObject *module, TyObject *Ty_UNUSED(ignored)) +os__emscripten_debugger(TyObject *module, TyObject *Py_UNUSED(ignored)) { return os__emscripten_debugger_impl(module); } diff --git a/Modules/clinic/pwdmodule.c.h b/Modules/clinic/pwdmodule.c.h index 2073680..3283bb1 100644 --- a/Modules/clinic/pwdmodule.c.h +++ b/Modules/clinic/pwdmodule.c.h @@ -61,7 +61,7 @@ static TyObject * pwd_getpwall_impl(TyObject *module); static TyObject * -pwd_getpwall(TyObject *module, TyObject *Ty_UNUSED(ignored)) +pwd_getpwall(TyObject *module, TyObject *Py_UNUSED(ignored)) { return pwd_getpwall_impl(module); } diff --git a/Modules/clinic/pyexpat.c.h b/Modules/clinic/pyexpat.c.h index 0bff873..93a09d7 100644 --- a/Modules/clinic/pyexpat.c.h +++ b/Modules/clinic/pyexpat.c.h @@ -50,7 +50,7 @@ static TyObject * pyexpat_xmlparser_GetReparseDeferralEnabled_impl(xmlparseobject *self); static TyObject * -pyexpat_xmlparser_GetReparseDeferralEnabled(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pyexpat_xmlparser_GetReparseDeferralEnabled(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pyexpat_xmlparser_GetReparseDeferralEnabled_impl((xmlparseobject *)self); } @@ -206,7 +206,7 @@ static TyObject * pyexpat_xmlparser_GetBase_impl(xmlparseobject *self); static TyObject * -pyexpat_xmlparser_GetBase(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pyexpat_xmlparser_GetBase(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pyexpat_xmlparser_GetBase_impl((xmlparseobject *)self); } @@ -227,7 +227,7 @@ static TyObject * pyexpat_xmlparser_GetInputContext_impl(xmlparseobject *self); static TyObject * -pyexpat_xmlparser_GetInputContext(TyObject *self, TyObject *Ty_UNUSED(ignored)) +pyexpat_xmlparser_GetInputContext(TyObject *self, TyObject *Py_UNUSED(ignored)) { return pyexpat_xmlparser_GetInputContext_impl((xmlparseobject *)self); } diff --git a/Modules/clinic/readline.c.h b/Modules/clinic/readline.c.h index 8a82fee..0156ed1 100644 --- a/Modules/clinic/readline.c.h +++ b/Modules/clinic/readline.c.h @@ -226,7 +226,7 @@ static TyObject * readline_get_history_length_impl(TyObject *module); static TyObject * -readline_get_history_length(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_get_history_length(TyObject *module, TyObject *Py_UNUSED(ignored)) { return readline_get_history_length_impl(module); } @@ -362,7 +362,7 @@ static TyObject * readline_get_completion_type_impl(TyObject *module); static TyObject * -readline_get_completion_type(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_get_completion_type(TyObject *module, TyObject *Py_UNUSED(ignored)) { return readline_get_completion_type_impl(module); } @@ -380,7 +380,7 @@ static TyObject * readline_get_begidx_impl(TyObject *module); static TyObject * -readline_get_begidx(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_get_begidx(TyObject *module, TyObject *Py_UNUSED(ignored)) { return readline_get_begidx_impl(module); } @@ -398,7 +398,7 @@ static TyObject * readline_get_endidx_impl(TyObject *module); static TyObject * -readline_get_endidx(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_get_endidx(TyObject *module, TyObject *Py_UNUSED(ignored)) { return readline_get_endidx_impl(module); } @@ -565,7 +565,7 @@ static TyObject * readline_get_completer_delims_impl(TyObject *module); static TyObject * -readline_get_completer_delims(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_get_completer_delims(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -627,7 +627,7 @@ static TyObject * readline_get_completer_impl(TyObject *module); static TyObject * -readline_get_completer(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_get_completer(TyObject *module, TyObject *Py_UNUSED(ignored)) { return readline_get_completer_impl(module); } @@ -675,7 +675,7 @@ static TyObject * readline_get_current_history_length_impl(TyObject *module); static TyObject * -readline_get_current_history_length(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_get_current_history_length(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -699,7 +699,7 @@ static TyObject * readline_get_line_buffer_impl(TyObject *module); static TyObject * -readline_get_line_buffer(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_get_line_buffer(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -725,7 +725,7 @@ static TyObject * readline_clear_history_impl(TyObject *module); static TyObject * -readline_clear_history(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_clear_history(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -775,7 +775,7 @@ static TyObject * readline_redisplay_impl(TyObject *module); static TyObject * -readline_redisplay(TyObject *module, TyObject *Ty_UNUSED(ignored)) +readline_redisplay(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Modules/clinic/resource.c.h b/Modules/clinic/resource.c.h index 735417f..9d17a9c 100644 --- a/Modules/clinic/resource.c.h +++ b/Modules/clinic/resource.c.h @@ -156,7 +156,7 @@ static int resource_getpagesize_impl(TyObject *module); static TyObject * -resource_getpagesize(TyObject *module, TyObject *Ty_UNUSED(ignored)) +resource_getpagesize(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; diff --git a/Modules/clinic/selectmodule.c.h b/Modules/clinic/selectmodule.c.h index 39a0064..a5f5664 100644 --- a/Modules/clinic/selectmodule.c.h +++ b/Modules/clinic/selectmodule.c.h @@ -449,7 +449,7 @@ static TyObject * select_devpoll_close_impl(devpollObject *self); static TyObject * -select_devpoll_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +select_devpoll_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -477,7 +477,7 @@ static TyObject * select_devpoll_fileno_impl(devpollObject *self); static TyObject * -select_devpoll_fileno(TyObject *self, TyObject *Ty_UNUSED(ignored)) +select_devpoll_fileno(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -508,7 +508,7 @@ static TyObject * select_poll_impl(TyObject *module); static TyObject * -select_poll(TyObject *module, TyObject *Ty_UNUSED(ignored)) +select_poll(TyObject *module, TyObject *Py_UNUSED(ignored)) { return select_poll_impl(module); } @@ -533,7 +533,7 @@ static TyObject * select_devpoll_impl(TyObject *module); static TyObject * -select_devpoll(TyObject *module, TyObject *Ty_UNUSED(ignored)) +select_devpoll(TyObject *module, TyObject *Py_UNUSED(ignored)) { return select_devpoll_impl(module); } @@ -645,7 +645,7 @@ static TyObject * select_epoll_close_impl(pyEpoll_Object *self); static TyObject * -select_epoll_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +select_epoll_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -673,7 +673,7 @@ static TyObject * select_epoll_fileno_impl(pyEpoll_Object *self); static TyObject * -select_epoll_fileno(TyObject *self, TyObject *Ty_UNUSED(ignored)) +select_epoll_fileno(TyObject *self, TyObject *Py_UNUSED(ignored)) { return select_epoll_fileno_impl((pyEpoll_Object *)self); } @@ -1041,7 +1041,7 @@ static TyObject * select_epoll___enter___impl(pyEpoll_Object *self); static TyObject * -select_epoll___enter__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +select_epoll___enter__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return select_epoll___enter___impl((pyEpoll_Object *)self); } @@ -1156,7 +1156,7 @@ static TyObject * select_kqueue_close_impl(kqueue_queue_Object *self); static TyObject * -select_kqueue_close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +select_kqueue_close(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1184,7 +1184,7 @@ static TyObject * select_kqueue_fileno_impl(kqueue_queue_Object *self); static TyObject * -select_kqueue_fileno(TyObject *self, TyObject *Ty_UNUSED(ignored)) +select_kqueue_fileno(TyObject *self, TyObject *Py_UNUSED(ignored)) { return select_kqueue_fileno_impl((kqueue_queue_Object *)self); } diff --git a/Modules/clinic/sha1module.c.h b/Modules/clinic/sha1module.c.h index 9246cd3..9da7bf3 100644 --- a/Modules/clinic/sha1module.c.h +++ b/Modules/clinic/sha1module.c.h @@ -43,7 +43,7 @@ static TyObject * SHA1Type_digest_impl(SHA1object *self); static TyObject * -SHA1Type_digest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +SHA1Type_digest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return SHA1Type_digest_impl((SHA1object *)self); } @@ -61,7 +61,7 @@ static TyObject * SHA1Type_hexdigest_impl(SHA1object *self); static TyObject * -SHA1Type_hexdigest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +SHA1Type_hexdigest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return SHA1Type_hexdigest_impl((SHA1object *)self); } diff --git a/Modules/clinic/sha2module.c.h b/Modules/clinic/sha2module.c.h index a27bd58..27ffb4c 100644 --- a/Modules/clinic/sha2module.c.h +++ b/Modules/clinic/sha2module.c.h @@ -65,7 +65,7 @@ static TyObject * SHA256Type_digest_impl(SHA256object *self); static TyObject * -SHA256Type_digest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +SHA256Type_digest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return SHA256Type_digest_impl((SHA256object *)self); } @@ -83,7 +83,7 @@ static TyObject * SHA512Type_digest_impl(SHA512object *self); static TyObject * -SHA512Type_digest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +SHA512Type_digest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return SHA512Type_digest_impl((SHA512object *)self); } @@ -101,7 +101,7 @@ static TyObject * SHA256Type_hexdigest_impl(SHA256object *self); static TyObject * -SHA256Type_hexdigest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +SHA256Type_hexdigest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return SHA256Type_hexdigest_impl((SHA256object *)self); } @@ -119,7 +119,7 @@ static TyObject * SHA512Type_hexdigest_impl(SHA512object *self); static TyObject * -SHA512Type_hexdigest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +SHA512Type_hexdigest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return SHA512Type_hexdigest_impl((SHA512object *)self); } diff --git a/Modules/clinic/sha3module.c.h b/Modules/clinic/sha3module.c.h index 7a1531a..3fc4f6a 100644 --- a/Modules/clinic/sha3module.c.h +++ b/Modules/clinic/sha3module.c.h @@ -106,7 +106,7 @@ static TyObject * _sha3_sha3_224_copy_impl(SHA3object *self); static TyObject * -_sha3_sha3_224_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_sha3_sha3_224_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _sha3_sha3_224_copy_impl((SHA3object *)self); } @@ -124,7 +124,7 @@ static TyObject * _sha3_sha3_224_digest_impl(SHA3object *self); static TyObject * -_sha3_sha3_224_digest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_sha3_sha3_224_digest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _sha3_sha3_224_digest_impl((SHA3object *)self); } @@ -142,7 +142,7 @@ static TyObject * _sha3_sha3_224_hexdigest_impl(SHA3object *self); static TyObject * -_sha3_sha3_224_hexdigest(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_sha3_sha3_224_hexdigest(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _sha3_sha3_224_hexdigest_impl((SHA3object *)self); } diff --git a/Modules/clinic/signalmodule.c.h b/Modules/clinic/signalmodule.c.h index 6201712..07a0ab6 100644 --- a/Modules/clinic/signalmodule.c.h +++ b/Modules/clinic/signalmodule.c.h @@ -96,7 +96,7 @@ static TyObject * signal_pause_impl(TyObject *module); static TyObject * -signal_pause(TyObject *module, TyObject *Ty_UNUSED(ignored)) +signal_pause(TyObject *module, TyObject *Py_UNUSED(ignored)) { return signal_pause_impl(module); } @@ -492,7 +492,7 @@ static TyObject * signal_sigpending_impl(TyObject *module); static TyObject * -signal_sigpending(TyObject *module, TyObject *Ty_UNUSED(ignored)) +signal_sigpending(TyObject *module, TyObject *Py_UNUSED(ignored)) { return signal_sigpending_impl(module); } @@ -552,7 +552,7 @@ static TyObject * signal_valid_signals_impl(TyObject *module); static TyObject * -signal_valid_signals(TyObject *module, TyObject *Ty_UNUSED(ignored)) +signal_valid_signals(TyObject *module, TyObject *Py_UNUSED(ignored)) { return signal_valid_signals_impl(module); } diff --git a/Modules/clinic/socketmodule.c.h b/Modules/clinic/socketmodule.c.h index 6017c30..54d705d 100644 --- a/Modules/clinic/socketmodule.c.h +++ b/Modules/clinic/socketmodule.c.h @@ -24,7 +24,7 @@ static TyObject * _socket_socket_close_impl(PySocketSockObject *s); static TyObject * -_socket_socket_close(TyObject *s, TyObject *Ty_UNUSED(ignored)) +_socket_socket_close(TyObject *s, TyObject *Py_UNUSED(ignored)) { return _socket_socket_close_impl((PySocketSockObject *)s); } diff --git a/Modules/clinic/syslogmodule.c.h b/Modules/clinic/syslogmodule.c.h index 510cfad..10b24b4 100644 --- a/Modules/clinic/syslogmodule.c.h +++ b/Modules/clinic/syslogmodule.c.h @@ -156,7 +156,7 @@ static TyObject * syslog_closelog_impl(TyObject *module); static TyObject * -syslog_closelog(TyObject *module, TyObject *Ty_UNUSED(ignored)) +syslog_closelog(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index bb3ba6c..ae8c2f0 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -278,7 +278,7 @@ faulthandler_dump_traceback_py(TyObject *self, if (TyErr_CheckSignals()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -306,7 +306,7 @@ faulthandler_dump_c_stack_py(TyObject *self, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static void @@ -601,7 +601,7 @@ faulthandler_py_enable(TyObject *self, TyObject *args, TyObject *kwargs) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static void @@ -625,17 +625,17 @@ faulthandler_disable(void) } static TyObject* -faulthandler_disable_py(TyObject *self, TyObject *Ty_UNUSED(ignored)) +faulthandler_disable_py(TyObject *self, TyObject *Py_UNUSED(ignored)) { if (!fatal_error.enabled) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } faulthandler_disable(); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } static TyObject* -faulthandler_is_enabled(TyObject *self, TyObject *Ty_UNUSED(ignored)) +faulthandler_is_enabled(TyObject *self, TyObject *Py_UNUSED(ignored)) { return TyBool_FromLong(fatal_error.enabled); } @@ -831,15 +831,15 @@ faulthandler_dump_traceback_later(TyObject *self, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject* faulthandler_cancel_dump_traceback_later_py(TyObject *self, - TyObject *Ty_UNUSED(ignored)) + TyObject *Py_UNUSED(ignored)) { cancel_dump_traceback_later(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1001,7 +1001,7 @@ faulthandler_register_py(TyObject *self, user->interp = TyThreadState_GetInterpreter(tstate); user->enabled = 1; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -1034,7 +1034,7 @@ faulthandler_unregister_py(TyObject *self, TyObject *args) return NULL; if (user_signals == NULL) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; user = &user_signals[signum]; change = faulthandler_unregister(user, signum); @@ -1121,7 +1121,7 @@ faulthandler_sigsegv(TyObject *self, TyObject *args) } else { faulthandler_raise_sigsegv(); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static void _Ty_NO_RETURN @@ -1157,11 +1157,11 @@ faulthandler_fatal_error_c_thread(TyObject *self, TyObject *args) PyThread_release_lock(lock); PyThread_free_lock(lock); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject* _Ty_NO_SANITIZE_UNDEFINED -faulthandler_sigfpe(TyObject *self, TyObject *Ty_UNUSED(dummy)) +faulthandler_sigfpe(TyObject *self, TyObject *Py_UNUSED(dummy)) { faulthandler_suppress_crash_report(); @@ -1184,7 +1184,7 @@ faulthandler_sigabrt(TyObject *self, TyObject *args) { faulthandler_suppress_crash_report(); abort(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #if defined(FAULTHANDLER_USE_ALT_STACK) @@ -1208,7 +1208,7 @@ stack_overflow(uintptr_t min_sp, uintptr_t max_sp, size_t *depth) } static TyObject * -faulthandler_stack_overflow(TyObject *self, TyObject *Ty_UNUSED(ignored)) +faulthandler_stack_overflow(TyObject *self, TyObject *Py_UNUSED(ignored)) { size_t depth, size; uintptr_t sp = (uintptr_t)&depth; @@ -1268,7 +1268,7 @@ faulthandler_raise_exception(TyObject *self, TyObject *args) return NULL; faulthandler_suppress_crash_report(); RaiseException(code, flags, 0, NULL); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c index ad45f0a..7a03112 100644 --- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -345,7 +345,7 @@ fcntl_flock_impl(TyObject *module, int fd, int code) if (ret < 0) { return !async_err ? TyErr_SetFromErrno(TyExc_OSError) : NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -448,7 +448,7 @@ fcntl_lockf_impl(TyObject *module, int fd, int code, TyObject *lenobj, if (ret < 0) { return !async_err ? TyErr_SetFromErrno(TyExc_OSError) : NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* List of functions */ diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index 808edcb..df11a63 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -36,7 +36,7 @@ gc_enable_impl(TyObject *module) /*[clinic end generated code: output=45a427e9dce9155c input=81ac4940ca579707]*/ { TyGC_Enable(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -50,7 +50,7 @@ gc_disable_impl(TyObject *module) /*[clinic end generated code: output=97d1030f7aa9d279 input=8c2e5a14e800d83b]*/ { TyGC_Disable(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -118,7 +118,7 @@ gc_set_debug_impl(TyObject *module, int flags) { GCState *gcstate = get_gc_state(); gcstate->debug = flags; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -166,7 +166,7 @@ gc_set_threshold_impl(TyObject *module, int threshold0, int group_right_1, if (group_right_2) { gcstate->old[1].threshold = threshold2; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -429,7 +429,7 @@ gc_freeze_impl(TyObject *module) { PyInterpreterState *interp = _TyInterpreterState_GET(); _TyGC_Freeze(interp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -446,7 +446,7 @@ gc_unfreeze_impl(TyObject *module) { PyInterpreterState *interp = _TyInterpreterState_GET(); _TyGC_Unfreeze(interp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Modules/getpath.c b/Modules/getpath.c index 6a9e6e8..6c30f2a 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -61,7 +61,7 @@ /* HELPER FUNCTIONS for getpath.py */ static TyObject * -getpath_abspath(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_abspath(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *r = NULL; TyObject *pathobj; @@ -86,7 +86,7 @@ getpath_abspath(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_basename(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_basename(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *path; if (!TyArg_ParseTuple(args, "U", &path)) { @@ -102,7 +102,7 @@ getpath_basename(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_dirname(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_dirname(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *path; if (!TyArg_ParseTuple(args, "U", &path)) { @@ -118,7 +118,7 @@ getpath_dirname(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_isabs(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_isabs(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *r = NULL; TyObject *pathobj; @@ -136,7 +136,7 @@ getpath_isabs(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_hassuffix(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_hassuffix(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *r = NULL; TyObject *pathobj; @@ -171,7 +171,7 @@ getpath_hassuffix(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_isdir(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_isdir(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *r = NULL; TyObject *pathobj; @@ -196,7 +196,7 @@ getpath_isdir(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_isfile(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_isfile(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *r = NULL; TyObject *pathobj; @@ -221,7 +221,7 @@ getpath_isfile(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_isxfile(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_isxfile(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *r = NULL; TyObject *pathobj; @@ -253,7 +253,7 @@ getpath_isxfile(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_joinpath(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_joinpath(TyObject *Py_UNUSED(self), TyObject *args) { if (!TyTuple_Check(args)) { TyErr_SetString(TyExc_TypeError, "requires tuple of arguments"); @@ -338,7 +338,7 @@ getpath_joinpath(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_readlines(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_readlines(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *r = NULL; TyObject *pathobj; @@ -422,7 +422,7 @@ getpath_readlines(TyObject *Ty_UNUSED(self), TyObject *args) static TyObject * -getpath_realpath(TyObject *Ty_UNUSED(self) , TyObject *args) +getpath_realpath(TyObject *Py_UNUSED(self) , TyObject *args) { TyObject *pathobj; if (!TyArg_ParseTuple(args, "U", &pathobj)) { @@ -583,21 +583,21 @@ static TyMethodDef getpath_methods[] = { are enabled or not. */ static TyObject * -getpath_warn(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_warn(TyObject *Py_UNUSED(self), TyObject *args) { TyObject *msgobj; if (!TyArg_ParseTuple(args, "U", &msgobj)) { return NULL; } fprintf(stderr, "%s\n", TyUnicode_AsUTF8(msgobj)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -getpath_nowarn(TyObject *Ty_UNUSED(self), TyObject *args) +getpath_nowarn(TyObject *Py_UNUSED(self), TyObject *args) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Modules/hmacmodule.c b/Modules/hmacmodule.c index fd6c5f7..5dc9592 100644 --- a/Modules/hmacmodule.c +++ b/Modules/hmacmodule.c @@ -450,7 +450,7 @@ assert_is_static_hmac_hash_kind(HMAC_Hash_Kind kind) } #else static inline void -assert_is_static_hmac_hash_kind(HMAC_Hash_Kind Ty_UNUSED(kind)) {} +assert_is_static_hmac_hash_kind(HMAC_Hash_Kind Py_UNUSED(kind)) {} #endif /* diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 0053833..7d67bc2 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -546,7 +546,7 @@ groupby_next(TyObject *op) else { int rcmp; - rcmp = PyObject_RichCompareBool(gbo->tgtkey, gbo->currkey, Ty_EQ); + rcmp = PyObject_RichCompareBool(gbo->tgtkey, gbo->currkey, Py_EQ); if (rcmp == -1) return NULL; else if (rcmp == 0) @@ -668,7 +668,7 @@ _grouper_next(TyObject *op) } assert(gbo->currkey != NULL); - rcmp = PyObject_RichCompareBool(igo->tgtkey, gbo->currkey, Ty_EQ); + rcmp = PyObject_RichCompareBool(igo->tgtkey, gbo->currkey, Py_EQ); if (rcmp <= 0) /* got any error or current group is end */ return NULL; @@ -956,7 +956,7 @@ tee_copy_impl(teeobject *to) } static inline TyObject * -tee_copy(TyObject *op, TyObject *Ty_UNUSED(ignored)) +tee_copy(TyObject *op, TyObject *Py_UNUSED(ignored)) { teeobject *to = teeobject_CAST(op); return (TyObject *)tee_copy_impl(to); @@ -1040,7 +1040,7 @@ static TyMethodDef tee_methods[] = { }; static TyMemberDef tee_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(teeobject, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(teeobject, weakreflist), Py_READONLY}, {NULL}, }; @@ -2060,7 +2060,7 @@ product_dealloc(TyObject *op) } static TyObject * -product_sizeof(TyObject *op, TyObject *Ty_UNUSED(ignored)) +product_sizeof(TyObject *op, TyObject *Py_UNUSED(ignored)) { productobject *lz = productobject_CAST(op); size_t res = _TyObject_SIZE(Ty_TYPE(lz)); @@ -2295,7 +2295,7 @@ combinations_dealloc(TyObject *op) } static TyObject * -combinations_sizeof(TyObject *op, TyObject *Ty_UNUSED(args)) +combinations_sizeof(TyObject *op, TyObject *Py_UNUSED(args)) { combinationsobject *co = combinationsobject_CAST(op); size_t res = _TyObject_SIZE(Ty_TYPE(co)); @@ -2539,7 +2539,7 @@ cwr_dealloc(TyObject *op) } static TyObject * -cwr_sizeof(TyObject *op, TyObject *Ty_UNUSED(args)) +cwr_sizeof(TyObject *op, TyObject *Py_UNUSED(args)) { cwrobject *co = cwrobject_CAST(op); size_t res = _TyObject_SIZE(Ty_TYPE(co)); @@ -2797,7 +2797,7 @@ permutations_dealloc(TyObject *op) } static TyObject * -permutations_sizeof(TyObject *op, TyObject *Ty_UNUSED(args)) +permutations_sizeof(TyObject *op, TyObject *Py_UNUSED(args)) { permutationsobject *po = permutationsobject_CAST(op); size_t res = _TyObject_SIZE(Ty_TYPE(po)); @@ -3653,7 +3653,7 @@ repeat_repr(TyObject *op) } static TyObject * -repeat_len(TyObject *op, TyObject *Ty_UNUSED(args)) +repeat_len(TyObject *op, TyObject *Py_UNUSED(args)) { repeatobject *ro = repeatobject_CAST(op); if (ro->cnt == -1) { diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index 85d3638..27f747c 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -1798,7 +1798,7 @@ math_isqrt(TyObject *module, TyObject *n) if (b == NULL) { goto error; } - a_too_large = PyObject_RichCompareBool(n, b, Ty_LT); + a_too_large = PyObject_RichCompareBool(n, b, Py_LT); Ty_DECREF(b); if (a_too_large == -1) { goto error; @@ -3768,7 +3768,7 @@ math_perm_impl(TyObject *module, TyObject *n, TyObject *k) goto error; } - cmp = PyObject_RichCompareBool(n, k, Ty_LT); + cmp = PyObject_RichCompareBool(n, k, Py_LT); if (cmp != 0) { if (cmp > 0) { result = TyLong_FromLong(0); @@ -3892,7 +3892,7 @@ math_comb_impl(TyObject *module, TyObject *n, TyObject *k) result = TyLong_FromLong(0); goto done; } - cmp = PyObject_RichCompareBool(temp, k, Ty_LT); + cmp = PyObject_RichCompareBool(temp, k, Py_LT); if (cmp > 0) { Ty_SETREF(k, temp); } diff --git a/Modules/md5module.c b/Modules/md5module.c index 67026e1..696bad6 100644 --- a/Modules/md5module.c +++ b/Modules/md5module.c @@ -219,7 +219,7 @@ MD5Type_update_impl(MD5object *self, TyObject *obj) } PyBuffer_Release(&buf); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef MD5_methods[] = { @@ -231,19 +231,19 @@ static TyMethodDef MD5_methods[] = { }; static TyObject * -MD5_get_block_size(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +MD5_get_block_size(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyLong_FromLong(MD5_BLOCKSIZE); } static TyObject * -MD5_get_name(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +MD5_get_name(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyUnicode_FromStringAndSize("md5", 3); } static TyObject * -md5_get_digest_size(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +md5_get_digest_size(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyLong_FromLong(MD5_DIGESTSIZE); } diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 04cd72b..79ed09a 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -171,7 +171,7 @@ mmap_object_dealloc(TyObject *op) } static TyObject * -mmap_close_method(TyObject *op, TyObject *Ty_UNUSED(ignored)) +mmap_close_method(TyObject *op, TyObject *Py_UNUSED(ignored)) { mmap_object *self = mmap_object_CAST(op); if (self->exports > 0) { @@ -220,7 +220,7 @@ mmap_close_method(TyObject *op, TyObject *Ty_UNUSED(ignored)) Ty_END_ALLOW_THREADS #endif - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef MS_WINDOWS @@ -462,7 +462,7 @@ _safe_PyBytes_FromStringAndSize(char *start, size_t num_bytes) { } static TyObject * -mmap_read_byte_method(TyObject *op, TyObject *Ty_UNUSED(ignored)) +mmap_read_byte_method(TyObject *op, TyObject *Py_UNUSED(ignored)) { mmap_object *self = mmap_object_CAST(op); CHECK_VALID(NULL); @@ -479,7 +479,7 @@ mmap_read_byte_method(TyObject *op, TyObject *Ty_UNUSED(ignored)) } static TyObject * -mmap_read_line_method(TyObject *op, TyObject *Ty_UNUSED(ignored)) +mmap_read_line_method(TyObject *op, TyObject *Py_UNUSED(ignored)) { Ty_ssize_t remaining; char *start, *eol; @@ -700,11 +700,11 @@ mmap_write_byte_method(TyObject *op, TyObject *args) return NULL; } self->pos++; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -mmap_size_method(TyObject *op, TyObject *Ty_UNUSED(ignored)) +mmap_size_method(TyObject *op, TyObject *Py_UNUSED(ignored)) { mmap_object *self = mmap_object_CAST(op); CHECK_VALID(NULL); @@ -863,7 +863,7 @@ mmap_resize_method(TyObject *op, TyObject *args) TyErr_SetFromWindowsErr(file_resize_error); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; #endif /* MS_WINDOWS */ #ifdef UNIX @@ -895,14 +895,14 @@ mmap_resize_method(TyObject *op, TyObject *args) } self->data = newmap; self->size = new_size; - Ty_RETURN_NONE; + Py_RETURN_NONE; #endif /* HAVE_MREMAP */ #endif /* UNIX */ } } static TyObject * -mmap_tell_method(TyObject *op, TyObject *Ty_UNUSED(ignored)) +mmap_tell_method(TyObject *op, TyObject *Py_UNUSED(ignored)) { mmap_object *self = mmap_object_CAST(op); CHECK_VALID(NULL); @@ -924,21 +924,21 @@ mmap_flush_method(TyObject *op, TyObject *args) } if (self->access == ACCESS_READ || self->access == ACCESS_COPY) - Ty_RETURN_NONE; + Py_RETURN_NONE; #if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM) if (!FlushViewOfFile(self->data+offset, size)) { TyErr_SetFromWindowsErr(GetLastError()); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; #elif defined(UNIX) /* XXX flags for msync? */ if (-1 == msync(self->data + offset, size, MS_SYNC)) { TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; #else TyErr_SetString(TyExc_ValueError, "flush not supported on this system"); return NULL; @@ -986,9 +986,9 @@ mmap_seek_method(TyObject *op, TyObject *args) } static TyObject * -mmap_seekable_method(TyObject *op, TyObject *Ty_UNUSED(ignored)) +mmap_seekable_method(TyObject *op, TyObject *Py_UNUSED(ignored)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } static TyObject * @@ -1011,7 +1011,7 @@ mmap_move_method(TyObject *op, TyObject *args) if (safe_memmove(self->data + dest, self->data + src, cnt) < 0) { return NULL; }; - Ty_RETURN_NONE; + Py_RETURN_NONE; bounds: TyErr_SetString(TyExc_ValueError, @@ -1021,7 +1021,7 @@ mmap_move_method(TyObject *op, TyObject *args) } static TyObject * -mmap_closed_get(TyObject *op, void *Ty_UNUSED(closure)) +mmap_closed_get(TyObject *op, void *Py_UNUSED(closure)) { mmap_object *self = mmap_object_CAST(op); #ifdef MS_WINDOWS @@ -1032,7 +1032,7 @@ mmap_closed_get(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -mmap__enter__method(TyObject *op, TyObject *Ty_UNUSED(ignored)) +mmap__enter__method(TyObject *op, TyObject *Py_UNUSED(ignored)) { mmap_object *self = mmap_object_CAST(op); CHECK_VALID(NULL); @@ -1041,7 +1041,7 @@ mmap__enter__method(TyObject *op, TyObject *Ty_UNUSED(ignored)) } static TyObject * -mmap__exit__method(TyObject *op, TyObject *Ty_UNUSED(args)) +mmap__exit__method(TyObject *op, TyObject *Py_UNUSED(args)) { return mmap_close_method(op, NULL); } @@ -1093,7 +1093,7 @@ mmap__repr__method(TyObject *op) #ifdef MS_WINDOWS static TyObject * -mmap__sizeof__method(TyObject *op, TyObject *Ty_UNUSED(dummy)) +mmap__sizeof__method(TyObject *op, TyObject *Py_UNUSED(dummy)) { mmap_object *self = mmap_object_CAST(op); size_t res = _TyObject_SIZE(Ty_TYPE(self)); @@ -1124,7 +1124,7 @@ mmap_protect_method(TyObject *op, TyObject *args) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -1166,12 +1166,12 @@ mmap_madvise_method(TyObject *op, TyObject *args) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif // HAVE_MADVISE static struct TyMemberDef mmap_object_members[] = { - {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(mmap_object, weakreflist), Ty_READONLY}, + {"__weaklistoffset__", Ty_T_PYSSIZET, offsetof(mmap_object, weakreflist), Py_READONLY}, {NULL}, }; @@ -1226,7 +1226,7 @@ mmap_buffer_getbuf(TyObject *op, Ty_buffer *view, int flags) } static void -mmap_buffer_releasebuf(TyObject *op, Ty_buffer *Ty_UNUSED(view)) +mmap_buffer_releasebuf(TyObject *op, Ty_buffer *Py_UNUSED(view)) { mmap_object *self = mmap_object_CAST(op); self->exports--; diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index 647d15e..25abba6 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -181,7 +181,7 @@ conv_string_to_unicode(const XML_Char *str) and hence in UTF-8. */ /* UTF-8 from Expat, Unicode desired */ if (str == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyUnicode_DecodeUTF8(str, strlen(str), "strict"); } @@ -199,7 +199,7 @@ conv_string_len_to_unicode(const XML_Char *str, int len) and hence in UTF-8. */ /* UTF-8 from Expat, Unicode desired */ if (str == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyUnicode_DecodeUTF8((const char *)str, len, "strict"); } @@ -761,7 +761,7 @@ pyexpat_xmlparser_SetReparseDeferralEnabled_impl(xmlparseobject *self, XML_SetReparseDeferralEnabled(self->itself, enabled ? XML_TRUE : XML_FALSE); self->reparse_deferral_enabled = (bool)enabled; #endif - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -949,7 +949,7 @@ pyexpat_xmlparser_SetBase_impl(xmlparseobject *self, const char *base) if (!XML_SetBase(self->itself, base)) { return TyErr_NoMemory(); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -987,10 +987,10 @@ pyexpat_xmlparser_GetInputContext_impl(xmlparseobject *self) return TyBytes_FromStringAndSize(buffer + offset, size - offset); else - Ty_RETURN_NONE; + Py_RETURN_NONE; } else - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1121,7 +1121,7 @@ pyexpat_xmlparser_UseForeignDTD_impl(xmlparseobject *self, TyTypeObject *cls, if (rc != XML_ERROR_NONE) { return set_error(state, self, rc); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -1380,7 +1380,7 @@ xmlparse_handler_setter(TyObject *op, TyObject *v, void *closure) #define INT_GETTER(name) \ static TyObject * \ - xmlparse_##name##_getter(TyObject *op, void *Ty_UNUSED(closure)) \ + xmlparse_##name##_getter(TyObject *op, void *Py_UNUSED(closure)) \ { \ xmlparseobject *self = xmlparseobject_CAST(op); \ return TyLong_FromLong((long)XML_Get##name(self->itself)); \ @@ -1396,14 +1396,14 @@ INT_GETTER(CurrentByteIndex) #undef INT_GETTER static TyObject * -xmlparse_buffer_text_getter(TyObject *op, void *Ty_UNUSED(closure)) +xmlparse_buffer_text_getter(TyObject *op, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); return TyBool_FromLong(self->buffer != NULL); } static int -xmlparse_buffer_text_setter(TyObject *op, TyObject *v, void *Ty_UNUSED(closure)) +xmlparse_buffer_text_setter(TyObject *op, TyObject *v, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); if (v == NULL) { @@ -1435,14 +1435,14 @@ xmlparse_buffer_text_setter(TyObject *op, TyObject *v, void *Ty_UNUSED(closure)) } static TyObject * -xmlparse_buffer_size_getter(TyObject *op, void *Ty_UNUSED(closure)) +xmlparse_buffer_size_getter(TyObject *op, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); return TyLong_FromLong(self->buffer_size); } static int -xmlparse_buffer_size_setter(TyObject *op, TyObject *v, void *Ty_UNUSED(closure)) +xmlparse_buffer_size_setter(TyObject *op, TyObject *v, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); if (v == NULL) { @@ -1494,21 +1494,21 @@ xmlparse_buffer_size_setter(TyObject *op, TyObject *v, void *Ty_UNUSED(closure)) } static TyObject * -xmlparse_buffer_used_getter(TyObject *op, void *Ty_UNUSED(closure)) +xmlparse_buffer_used_getter(TyObject *op, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); return TyLong_FromLong(self->buffer_used); } static TyObject * -xmlparse_namespace_prefixes_getter(TyObject *op, void *Ty_UNUSED(closure)) +xmlparse_namespace_prefixes_getter(TyObject *op, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); return TyBool_FromLong(self->ns_prefixes); } static int -xmlparse_namespace_prefixes_setter(TyObject *op, TyObject *v, void *Ty_UNUSED(closure)) +xmlparse_namespace_prefixes_setter(TyObject *op, TyObject *v, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); if (v == NULL) { @@ -1525,14 +1525,14 @@ xmlparse_namespace_prefixes_setter(TyObject *op, TyObject *v, void *Ty_UNUSED(cl } static TyObject * -xmlparse_ordered_attributes_getter(TyObject *op, void *Ty_UNUSED(closure)) +xmlparse_ordered_attributes_getter(TyObject *op, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); return TyBool_FromLong(self->ordered_attributes); } static int -xmlparse_ordered_attributes_setter(TyObject *op, TyObject *v, void *Ty_UNUSED(closure)) +xmlparse_ordered_attributes_setter(TyObject *op, TyObject *v, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); if (v == NULL) { @@ -1548,14 +1548,14 @@ xmlparse_ordered_attributes_setter(TyObject *op, TyObject *v, void *Ty_UNUSED(cl } static TyObject * -xmlparse_specified_attributes_getter(TyObject *op, void *Ty_UNUSED(closure)) +xmlparse_specified_attributes_getter(TyObject *op, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); return TyBool_FromLong(self->specified_attributes); } static int -xmlparse_specified_attributes_setter(TyObject *op, TyObject *v, void *Ty_UNUSED(closure)) +xmlparse_specified_attributes_setter(TyObject *op, TyObject *v, void *Py_UNUSED(closure)) { xmlparseobject *self = xmlparseobject_CAST(op); if (v == NULL) { @@ -1571,7 +1571,7 @@ xmlparse_specified_attributes_setter(TyObject *op, TyObject *v, void *Ty_UNUSED( } static TyMemberDef xmlparse_members[] = { - {"intern", _Ty_T_OBJECT, offsetof(xmlparseobject, intern), Ty_READONLY, NULL}, + {"intern", _Ty_T_OBJECT, offsetof(xmlparseobject, intern), Py_READONLY, NULL}, {NULL} }; diff --git a/Modules/readline.c b/Modules/readline.c index ea9fbdb..349ba9c 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -229,7 +229,7 @@ readline_parse_and_bind_impl(TyObject *module, TyObject *string) Ty_DECREF(encoded); rl_parse_and_bind(copy); TyMem_Free(copy); /* Free the copy */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Exported function to parse a readline init file */ @@ -272,7 +272,7 @@ readline_read_init_file_impl(TyObject *module, TyObject *filename_obj) if (errno) return TyErr_SetFromErrno(TyExc_OSError); disable_bracketed_paste(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Exported function to load a readline history file */ @@ -312,7 +312,7 @@ readline_read_history_file_impl(TyObject *module, TyObject *filename_obj) } if (errno) return TyErr_SetFromErrno(TyExc_OSError); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int _history_length = -1; /* do not truncate history by default */ @@ -362,7 +362,7 @@ readline_write_history_file_impl(TyObject *module, TyObject *filename_obj) errno = err; if (errno) return TyErr_SetFromErrno(TyExc_OSError); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef HAVE_RL_APPEND_HISTORY @@ -420,7 +420,7 @@ readline_append_history_file_impl(TyObject *module, int nelements, errno = err; if (errno) return TyErr_SetFromErrno(TyExc_OSError); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -443,7 +443,7 @@ readline_set_history_length_impl(TyObject *module, int length) /*[clinic end generated code: output=e161a53e45987dc7 input=b8901bf16488b760]*/ { FT_ATOMIC_STORE_INT_RELAXED(_history_length, length); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Get history length */ @@ -479,7 +479,7 @@ set_hook(const char *funcname, TyObject **hook_var, TyObject *function) funcname); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -655,7 +655,7 @@ readline_set_completer_delims_impl(TyObject *module, TyObject *string) } #endif rl_completer_word_break_characters = break_chars; - Ty_RETURN_NONE; + Py_RETURN_NONE; } else return TyErr_NoMemory(); @@ -723,7 +723,7 @@ readline_remove_history_item_impl(TyObject *module, int entry_number) } /* free memory allocated for the history entry */ _py_free_history_entry_lock_held(entry); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -768,7 +768,7 @@ readline_replace_history_item_impl(TyObject *module, int entry_number, } /* free memory allocated for the old history entry */ _py_free_history_entry_lock_held(old_entry); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Add a line to the history buffer */ @@ -793,7 +793,7 @@ readline_add_history_impl(TyObject *module, TyObject *string) } add_history(TyBytes_AS_STRING(encoded)); Ty_DECREF(encoded); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int should_auto_add_history = 1; @@ -815,7 +815,7 @@ readline_set_auto_history_impl(TyObject *module, /*[clinic end generated code: output=619c6968246fd82b input=3d413073a1a03355]*/ { should_auto_add_history = _should_auto_add_history; - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -871,7 +871,7 @@ readline_get_completer_impl(TyObject *module) { readlinestate *state = get_readline_state(module); if (state->completer == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(state->completer); } @@ -929,13 +929,13 @@ readline_get_history_item_impl(TyObject *module, int idx) */ if (idx < (0 + libedit_history_start) || idx >= (length + libedit_history_start)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } if ((hist_ent = history_get(idx))) return decode(hist_ent->line); else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -987,7 +987,7 @@ readline_clear_history_impl(TyObject *module) /*[clinic end generated code: output=1f2dbb0dfa5d5ebb input=b2c6b11551593053]*/ { clear_history(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -1014,7 +1014,7 @@ readline_insert_text_impl(TyObject *module, TyObject *string) } rl_insert_text(TyBytes_AS_STRING(encoded)); Ty_DECREF(encoded); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Redisplay the line buffer */ @@ -1031,7 +1031,7 @@ readline_redisplay_impl(TyObject *module) /*[clinic end generated code: output=a8b9725827c3c34b input=5895fd014615ff58]*/ { rl_redisplay(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #include "clinic/readline.c.h" @@ -1110,7 +1110,7 @@ static int #if defined(_RL_FUNCTION_TYPEDEF) || !defined(Ty_RL_STARTUP_HOOK_TAKES_ARGS) on_startup_hook(void) #else -on_startup_hook(const char *Ty_UNUSED(text), int Ty_UNUSED(state)) +on_startup_hook(const char *Py_UNUSED(text), int Py_UNUSED(state)) #endif { int r; @@ -1130,7 +1130,7 @@ static int #if defined(_RL_FUNCTION_TYPEDEF) || !defined(Ty_RL_STARTUP_HOOK_TAKES_ARGS) on_pre_input_hook(void) #else -on_pre_input_hook(const char *Ty_UNUSED(text), int Ty_UNUSED(state)) +on_pre_input_hook(const char *Py_UNUSED(text), int Py_UNUSED(state)) #endif { int r; diff --git a/Modules/resource.c b/Modules/resource.c index c7584cf..0892074 100644 --- a/Modules/resource.c +++ b/Modules/resource.c @@ -272,7 +272,7 @@ resource_setrlimit_impl(TyObject *module, int resource, TyObject *limits) TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef HAVE_PRLIMIT diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index 16456a2..b027d7b 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -511,7 +511,7 @@ select_poll_register_impl(pollObject *self, int fd, unsigned short eventmask) self->ufd_uptodate = 0; - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -564,7 +564,7 @@ select_poll_modify_impl(pollObject *self, int fd, unsigned short eventmask) self->ufd_uptodate = 0; - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -599,7 +599,7 @@ select_poll_unregister_impl(pollObject *self, int fd) Ty_DECREF(key); self->ufd_uptodate = 0; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -862,7 +862,7 @@ internal_devpoll_register(devpollObject *self, int fd, return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -934,7 +934,7 @@ select_devpoll_unregister_impl(devpollObject *self, int fd) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1089,17 +1089,17 @@ select_devpoll_close_impl(devpollObject *self) TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -devpoll_get_closed(TyObject *op, void *Ty_UNUSED(closure)) +devpoll_get_closed(TyObject *op, void *Py_UNUSED(closure)) { devpollObject *self = devpollObject_CAST(op); if (self->fd_devpoll < 0) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /*[clinic input] @@ -1415,18 +1415,18 @@ select_epoll_close_impl(pyEpoll_Object *self) TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -pyepoll_get_closed(TyObject *op, void *Ty_UNUSED(closure)) +pyepoll_get_closed(TyObject *op, void *Py_UNUSED(closure)) { pyEpoll_Object *self = pyEpoll_Object_CAST(op); if (self->epfd < 0) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /*[clinic input] @@ -1499,7 +1499,7 @@ pyepoll_internal_ctl(int epfd, int op, int fd, unsigned int events) TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1955,7 +1955,7 @@ kqueue_event_richcompare(TyObject *lhs, TyObject *rhs, int op) _selectstate *state = _selectstate_by_type(Ty_TYPE(s)); if (!kqueue_event_Check(rhs, state)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } kqueue_event_Object *o = (kqueue_event_Object *)rhs; // fast cast @@ -1969,7 +1969,7 @@ kqueue_event_richcompare(TyObject *lhs, TyObject *rhs, int op) : 0; #undef CMP - Ty_RETURN_RICHCOMPARE(result, 0, op); + Py_RETURN_RICHCOMPARE(result, 0, op); } static TyType_Slot kqueue_event_Type_slots[] = { @@ -1998,7 +1998,7 @@ kqueue_queue_err_closed(void) } static TyObject * -kqueue_tracking_after_fork(TyObject *module, TyObject *Ty_UNUSED(dummy)) { +kqueue_tracking_after_fork(TyObject *module, TyObject *Py_UNUSED(dummy)) { _selectstate *state = get_select_state(module); _kqueue_list_item *item = state->kqueue_open_list; state->kqueue_open_list = NULL; @@ -2012,7 +2012,7 @@ kqueue_tracking_after_fork(TyObject *module, TyObject *Ty_UNUSED(dummy)) { TyMem_Free(item); item = next; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef kqueue_tracking_after_fork_def = { @@ -2231,17 +2231,17 @@ select_kqueue_close_impl(kqueue_queue_Object *self) TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -kqueue_queue_get_closed(TyObject *op, void *Ty_UNUSED(closure)) +kqueue_queue_get_closed(TyObject *op, void *Py_UNUSED(closure)) { kqueue_queue_Object *self = kqueue_queue_Object_CAST(op); if (self->kqfd < 0) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /*[clinic input] diff --git a/Modules/sha1module.c b/Modules/sha1module.c index 5623844..3b1b212 100644 --- a/Modules/sha1module.c +++ b/Modules/sha1module.c @@ -215,7 +215,7 @@ SHA1Type_update_impl(SHA1object *self, TyObject *obj) } PyBuffer_Release(&buf); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef SHA1_methods[] = { @@ -227,19 +227,19 @@ static TyMethodDef SHA1_methods[] = { }; static TyObject * -SHA1_get_block_size(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +SHA1_get_block_size(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyLong_FromLong(SHA1_BLOCKSIZE); } static TyObject * -SHA1_get_name(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +SHA1_get_name(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyUnicode_FromStringAndSize("sha1", 4); } static TyObject * -sha1_get_digest_size(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +sha1_get_digest_size(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyLong_FromLong(SHA1_DIGESTSIZE); } diff --git a/Modules/sha2module.c b/Modules/sha2module.c index e067c39..431b6d4 100644 --- a/Modules/sha2module.c +++ b/Modules/sha2module.c @@ -426,7 +426,7 @@ SHA256Type_update_impl(SHA256object *self, TyObject *obj) } PyBuffer_Release(&buf); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -460,7 +460,7 @@ SHA512Type_update_impl(SHA512object *self, TyObject *obj) } PyBuffer_Release(&buf); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef SHA256_methods[] = { @@ -480,33 +480,33 @@ static TyMethodDef SHA512_methods[] = { }; static TyObject * -SHA256_get_block_size(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +SHA256_get_block_size(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyLong_FromLong(SHA256_BLOCKSIZE); } static TyObject * -SHA512_get_block_size(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +SHA512_get_block_size(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyLong_FromLong(SHA512_BLOCKSIZE); } static TyObject * -SHA256_get_digest_size(TyObject *op, void *Ty_UNUSED(closure)) +SHA256_get_digest_size(TyObject *op, void *Py_UNUSED(closure)) { SHA256object *self = _SHA256object_CAST(op); return TyLong_FromLong(self->digestsize); } static TyObject * -SHA512_get_digest_size(TyObject *op, void *Ty_UNUSED(closure)) +SHA512_get_digest_size(TyObject *op, void *Py_UNUSED(closure)) { SHA512object *self = _SHA512object_CAST(op); return TyLong_FromLong(self->digestsize); } static TyObject * -SHA256_get_name(TyObject *op, void *Ty_UNUSED(closure)) +SHA256_get_name(TyObject *op, void *Py_UNUSED(closure)) { SHA256object *self = _SHA256object_CAST(op); if (self->digestsize == 28) { @@ -516,7 +516,7 @@ SHA256_get_name(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -SHA512_get_name(TyObject *op, void *Ty_UNUSED(closure)) +SHA512_get_name(TyObject *op, void *Py_UNUSED(closure)) { SHA512object *self = _SHA512object_CAST(op); if (self->digestsize == 64) { diff --git a/Modules/sha3module.c b/Modules/sha3module.c index d9a622a..1920480 100644 --- a/Modules/sha3module.c +++ b/Modules/sha3module.c @@ -320,7 +320,7 @@ _sha3_sha3_224_update_impl(SHA3object *self, TyObject *data) } PyBuffer_Release(&buf); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -334,7 +334,7 @@ static TyMethodDef SHA3_methods[] = { static TyObject * -SHA3_get_block_size(TyObject *op, void *Ty_UNUSED(closure)) +SHA3_get_block_size(TyObject *op, void *Py_UNUSED(closure)) { SHA3object *self = _SHA3object_CAST(op); uint32_t rate = Hacl_Hash_SHA3_block_len(self->hash_state); @@ -343,7 +343,7 @@ SHA3_get_block_size(TyObject *op, void *Ty_UNUSED(closure)) static TyObject * -SHA3_get_name(TyObject *self, void *Ty_UNUSED(closure)) +SHA3_get_name(TyObject *self, void *Py_UNUSED(closure)) { TyTypeObject *type = Ty_TYPE(self); @@ -370,7 +370,7 @@ SHA3_get_name(TyObject *self, void *Ty_UNUSED(closure)) static TyObject * -SHA3_get_digest_size(TyObject *op, void *Ty_UNUSED(closure)) +SHA3_get_digest_size(TyObject *op, void *Py_UNUSED(closure)) { // Preserving previous behavior: variable-length algorithms return 0 SHA3object *self = _SHA3object_CAST(op); @@ -382,7 +382,7 @@ SHA3_get_digest_size(TyObject *op, void *Ty_UNUSED(closure)) static TyObject * -SHA3_get_capacity_bits(TyObject *op, void *Ty_UNUSED(closure)) +SHA3_get_capacity_bits(TyObject *op, void *Py_UNUSED(closure)) { SHA3object *self = _SHA3object_CAST(op); uint32_t rate = Hacl_Hash_SHA3_block_len(self->hash_state) * 8; @@ -393,7 +393,7 @@ SHA3_get_capacity_bits(TyObject *op, void *Ty_UNUSED(closure)) static TyObject * -SHA3_get_rate_bits(TyObject *op, void *Ty_UNUSED(closure)) +SHA3_get_rate_bits(TyObject *op, void *Py_UNUSED(closure)) { SHA3object *self = _SHA3object_CAST(op); uint32_t rate = Hacl_Hash_SHA3_block_len(self->hash_state) * 8; @@ -401,7 +401,7 @@ SHA3_get_rate_bits(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -SHA3_get_suffix(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +SHA3_get_suffix(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { unsigned char suffix[2] = {0x06, 0}; return TyBytes_FromStringAndSize((const char *)suffix, 1); @@ -538,13 +538,13 @@ _sha3_shake_128_hexdigest_impl(SHA3object *self, unsigned long length) } static TyObject * -SHAKE_get_digest_size(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +SHAKE_get_digest_size(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { return TyLong_FromLong(0); } static TyObject * -SHAKE_get_suffix(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(closure)) +SHAKE_get_suffix(TyObject *Py_UNUSED(self), void *Py_UNUSED(closure)) { unsigned char suffix[2] = {0x1f, 0}; return TyBytes_FromStringAndSize((const char *)suffix, 1); diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 1dee028..ea22dc7 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -160,7 +160,7 @@ compare_handler(TyObject *func, TyObject *dfl_ign_handler) return 0; } // Assume that comparison of two PyLong objects will never fail. - return PyObject_RichCompareBool(func, dfl_ign_handler, Ty_EQ) == 1; + return PyObject_RichCompareBool(func, dfl_ign_handler, Py_EQ) == 1; } #ifdef HAVE_SETITIMER @@ -421,7 +421,7 @@ signal_pause_impl(TyObject *module) if (TyErr_CheckSignals()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -456,7 +456,7 @@ signal_raise_signal_impl(TyObject *module, int signalnum) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -544,7 +544,7 @@ signal_signal_impl(TyObject *module, int signalnum, TyObject *handler) return old_handler; } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -579,7 +579,7 @@ signal_getsignal_impl(TyObject *module, int signalnum) return Ty_NewRef(old_handler); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } @@ -649,14 +649,14 @@ signal_strsignal_impl(TyObject *module, int signalnum) res = "Terminated"; break; default: - Ty_RETURN_NONE; + Py_RETURN_NONE; } #else errno = 0; res = strsignal(signalnum); if (errno || res == NULL || strstr(res, "Unknown signal") != NULL) - Ty_RETURN_NONE; + Py_RETURN_NONE; #endif return TyUnicode_FromString(res); @@ -702,7 +702,7 @@ signal_siginterrupt_impl(TyObject *module, int signalnum, int flag) TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif @@ -1238,7 +1238,7 @@ signal_sigtimedwait_impl(TyObject *module, sigset_t sigset, if (errno != EINTR) { if (errno == EAGAIN) - Ty_RETURN_NONE; + Py_RETURN_NONE; else return TyErr_SetFromErrno(TyExc_OSError); } @@ -1295,7 +1295,7 @@ signal_pthread_kill_impl(TyObject *module, unsigned long thread_id, if (TyErr_CheckSignals()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* #if defined(HAVE_PTHREAD_KILL) */ @@ -1330,7 +1330,7 @@ signal_pidfd_send_signal_impl(TyObject *module, int pidfd, int signalnum, TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c index 25d0862..47e7c2d 100644 --- a/Modules/syslogmodule.c +++ b/Modules/syslogmodule.c @@ -193,7 +193,7 @@ syslog_openlog_impl(TyObject *module, TyObject *ident, long logopt, S_log_open = 1; Ty_XSETREF(S_ident_o, ident); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -249,7 +249,7 @@ syslog_syslog_impl(TyObject *module, int group_left_1, int priority, Ty_END_ALLOW_THREADS; #endif Ty_XDECREF(ident); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -279,7 +279,7 @@ syslog_closelog_impl(TyObject *module) Ty_CLEAR(S_ident_o); S_log_open = 0; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Modules/termios.c b/Modules/termios.c index 30c48b3..763b89e 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -277,7 +277,7 @@ termios_tcsetattr_impl(TyObject *module, int fd, int when, TyObject *term) if (r == -1) return TyErr_SetFromErrno(state->TermiosError); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -308,7 +308,7 @@ termios_tcsendbreak_impl(TyObject *module, int fd, int duration) return TyErr_SetFromErrno(state->TermiosError); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -335,7 +335,7 @@ termios_tcdrain_impl(TyObject *module, int fd) return TyErr_SetFromErrno(state->TermiosError); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -367,7 +367,7 @@ termios_tcflush_impl(TyObject *module, int fd, int queue) return TyErr_SetFromErrno(state->TermiosError); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -399,7 +399,7 @@ termios_tcflow_impl(TyObject *module, int fd, int action) return TyErr_SetFromErrno(state->TermiosError); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -540,7 +540,7 @@ termios_tcsetwinsize_impl(TyObject *module, int fd, TyObject *winsz) return TyErr_SetFromErrno(state->TermiosError); } - Ty_RETURN_NONE; + Py_RETURN_NONE; #elif defined(TIOCGSIZE) && defined(TIOCSSIZE) struct ttysize s; int r; @@ -569,7 +569,7 @@ termios_tcsetwinsize_impl(TyObject *module, int fd, TyObject *winsz) return TyErr_SetFromErrno(state->TermiosError); } - Ty_RETURN_NONE; + Py_RETURN_NONE; #else TyErr_SetString(TyExc_NotImplementedError, "requires termios.TIOCGWINSZ, termios.TIOCSWINSZ and/or termios.TIOCGSIZE, termios.TIOCSSIZE"); diff --git a/Modules/timemodule.c b/Modules/timemodule.c index d07a6c4..c1f9deb 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -289,7 +289,7 @@ time_clock_settime(TyObject *self, TyObject *args) TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(clock_settime_doc, @@ -322,7 +322,7 @@ time_clock_settime_ns(TyObject *self, TyObject *args) TyErr_SetFromErrno(TyExc_OSError); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(clock_settime_ns_doc, @@ -408,7 +408,7 @@ time_sleep(TyObject *self, TyObject *timeout_obj) if (pysleep(timeout) != 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(sleep_doc, @@ -1176,7 +1176,7 @@ time_tzset(TyObject *self, TyObject *unused) if (TyErr_Occurred()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(tzset_doc, diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index 71ed0a1..cb17e4f 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -84,7 +84,7 @@ typedef struct previous_version { #define get_old_record(self, v) (PreviousDBVersion_CAST(self)->getrecord(v)) static TyMemberDef DB_members[] = { - {"unidata_version", Ty_T_STRING, offsetof(PreviousDBVersion, name), Ty_READONLY}, + {"unidata_version", Ty_T_STRING, offsetof(PreviousDBVersion, name), Py_READONLY}, {NULL} }; @@ -866,7 +866,7 @@ unicodedata_UCD_is_normalized_impl(TyObject *self, TyObject *form, { if (TyUnicode_GET_LENGTH(input) == 0) { /* special case empty input strings. */ - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } TyObject *result; diff --git a/Modules/xxlimited.c b/Modules/xxlimited.c index 3e4a2ed..74d34fe 100644 --- a/Modules/xxlimited.c +++ b/Modules/xxlimited.c @@ -250,14 +250,14 @@ Xxo_getbuffer(TyObject *op, Ty_buffer *view, int flags) } static void -Xxo_releasebuffer(TyObject *op, Ty_buffer *Ty_UNUSED(view)) +Xxo_releasebuffer(TyObject *op, Ty_buffer *Py_UNUSED(view)) { XxoObject *self = XxoObject_CAST(op); self->x_exports--; } static TyObject * -Xxo_get_x_exports(TyObject *op, void *Ty_UNUSED(closure)) +Xxo_get_x_exports(TyObject *op, void *Py_UNUSED(closure)) { XxoObject *self = XxoObject_CAST(op); return TyLong_FromSsize_t(self->x_exports); @@ -333,7 +333,7 @@ xx_foo(TyObject *module, TyObject *args) /* Function of no arguments returning new Xxo object */ static TyObject * -xx_new(TyObject *module, TyObject *Ty_UNUSED(unused)) +xx_new(TyObject *module, TyObject *Py_UNUSED(unused)) { XxoObject *rv; diff --git a/Modules/xxlimited_35.c b/Modules/xxlimited_35.c index f99a3f7..43aab21 100644 --- a/Modules/xxlimited_35.c +++ b/Modules/xxlimited_35.c @@ -208,7 +208,7 @@ static TyType_Spec Str_Type_spec = { static TyObject * null_richcompare(TyObject *self, TyObject *other, int op) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } static TyType_Slot Null_Type_slots[] = { diff --git a/Modules/xxmodule.c b/Modules/xxmodule.c index d50b4f3..5e37ccb 100644 --- a/Modules/xxmodule.c +++ b/Modules/xxmodule.c @@ -49,7 +49,7 @@ Xxo_dealloc(TyObject *op) } static TyObject * -Xxo_demo(TyObject *Ty_UNUSED(op), TyObject *args) +Xxo_demo(TyObject *Py_UNUSED(op), TyObject *args) { if (!TyArg_ParseTuple(args, ":demo")) { return NULL; diff --git a/Modules/xxsubtype.c b/Modules/xxsubtype.c index 7b83749..ec171a7 100644 --- a/Modules/xxsubtype.c +++ b/Modules/xxsubtype.c @@ -95,7 +95,7 @@ spamlist_init(TyObject *op, TyObject *args, TyObject *kwds) } static TyObject * -spamlist_state_get(TyObject *op, void *Ty_UNUSED(closure)) +spamlist_state_get(TyObject *op, void *Py_UNUSED(closure)) { spamlistobject *self = _spamlistobject_CAST(op); return TyLong_FromLong(self->state); @@ -200,7 +200,7 @@ spamdict_init(TyObject *op, TyObject *args, TyObject *kwds) } static TyMemberDef spamdict_members[] = { - {"state", Ty_T_INT, offsetof(spamdictobject, state), Ty_READONLY, + {"state", Ty_T_INT, offsetof(spamdictobject, state), Py_READONLY, PyDoc_STR("an int variable for demonstration purposes")}, {0} }; diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index 1fcc5d9..da63116 100644 --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -1811,9 +1811,9 @@ static TyMethodDef ZlibDecompressor_methods[] = { #define COMP_OFF(x) offsetof(compobject, x) static TyMemberDef Decomp_members[] = { - {"unused_data", _Ty_T_OBJECT, COMP_OFF(unused_data), Ty_READONLY}, - {"unconsumed_tail", _Ty_T_OBJECT, COMP_OFF(unconsumed_tail), Ty_READONLY}, - {"eof", Ty_T_BOOL, COMP_OFF(eof), Ty_READONLY}, + {"unused_data", _Ty_T_OBJECT, COMP_OFF(unused_data), Py_READONLY}, + {"unconsumed_tail", _Ty_T_OBJECT, COMP_OFF(unconsumed_tail), Py_READONLY}, + {"eof", Ty_T_BOOL, COMP_OFF(eof), Py_READONLY}, {NULL}, }; @@ -1828,10 +1828,10 @@ PyDoc_STRVAR(ZlibDecompressor_needs_input_doc, static TyMemberDef ZlibDecompressor_members[] = { {"eof", Ty_T_BOOL, offsetof(ZlibDecompressor, eof), - Ty_READONLY, ZlibDecompressor_eof__doc__}, + Py_READONLY, ZlibDecompressor_eof__doc__}, {"unused_data", Ty_T_OBJECT_EX, offsetof(ZlibDecompressor, unused_data), - Ty_READONLY, ZlibDecompressor_unused_data__doc__}, - {"needs_input", Ty_T_BOOL, offsetof(ZlibDecompressor, needs_input), Ty_READONLY, + Py_READONLY, ZlibDecompressor_unused_data__doc__}, + {"needs_input", Ty_T_BOOL, offsetof(ZlibDecompressor, needs_input), Py_READONLY, ZlibDecompressor_needs_input_doc}, {NULL}, }; diff --git a/Objects/abstract.c b/Objects/abstract.c index 2da9026..3679bd3 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -976,7 +976,7 @@ binary_op1(TyObject *v, TyObject *w, const int op_slot } Ty_DECREF(x); /* can't do it */ } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } #ifdef NDEBUG @@ -2163,7 +2163,7 @@ _PySequence_IterSearch(TyObject *seq, TyObject *obj, int operation) break; } - cmp = PyObject_RichCompareBool(item, obj, Ty_EQ); + cmp = PyObject_RichCompareBool(item, obj, Py_EQ); Ty_DECREF(item); if (cmp < 0) goto Fail; diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 5c59e55..31b1ef2 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -1189,34 +1189,34 @@ bytearray_richcompare(TyObject *self, TyObject *other, int op) if (!PyObject_CheckBuffer(self) || !PyObject_CheckBuffer(other)) { if (TyUnicode_Check(self) || TyUnicode_Check(other)) { - if (_Ty_GetConfig()->bytes_warning && (op == Ty_EQ || op == Ty_NE)) { + if (_Ty_GetConfig()->bytes_warning && (op == Py_EQ || op == Py_NE)) { if (TyErr_WarnEx(TyExc_BytesWarning, "Comparison between bytearray and string", 1)) return NULL; } } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } /* Bytearrays can be compared to anything that supports the buffer API. */ if (PyObject_GetBuffer(self, &self_bytes, PyBUF_SIMPLE) != 0) { TyErr_Clear(); - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } self_size = self_bytes.len; if (PyObject_GetBuffer(other, &other_bytes, PyBUF_SIMPLE) != 0) { TyErr_Clear(); PyBuffer_Release(&self_bytes); - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } other_size = other_bytes.len; - if (self_size != other_size && (op == Ty_EQ || op == Ty_NE)) { + if (self_size != other_size && (op == Py_EQ || op == Py_NE)) { /* Shortcut: if the lengths differ, the objects differ */ PyBuffer_Release(&self_bytes); PyBuffer_Release(&other_bytes); - return TyBool_FromLong((op == Ty_NE)); + return TyBool_FromLong((op == Py_NE)); } else { cmp = memcmp(self_bytes.buf, other_bytes.buf, @@ -1227,10 +1227,10 @@ bytearray_richcompare(TyObject *self, TyObject *other, int op) PyBuffer_Release(&other_bytes); if (cmp != 0) { - Ty_RETURN_RICHCOMPARE(cmp, 0, op); + Py_RETURN_RICHCOMPARE(cmp, 0, op); } - Ty_RETURN_RICHCOMPARE(self_size, other_size, op); + Py_RETURN_RICHCOMPARE(self_size, other_size, op); } } @@ -1332,7 +1332,7 @@ bytearray_clear_impl(PyByteArrayObject *self) { if (TyByteArray_Resize((TyObject *)self, 0) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1555,7 +1555,7 @@ bytearray_resize_impl(PyByteArrayObject *self, Ty_ssize_t size) if (size > start_size) { memset(TyByteArray_AS_STRING(self) + start_size, 0, size - start_size); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1896,7 +1896,7 @@ bytearray_reverse_impl(PyByteArrayObject *self) *tail-- = swap; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1947,11 +1947,11 @@ bytearray_insert_impl(PyByteArrayObject *self, Ty_ssize_t index, int item) memmove(buf + index + 1, buf + index, n - index); buf[index] = item; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -bytearray_isalnum(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_isalnum(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -1961,7 +1961,7 @@ bytearray_isalnum(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_isalpha(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_isalpha(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -1971,7 +1971,7 @@ bytearray_isalpha(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_isascii(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_isascii(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -1981,7 +1981,7 @@ bytearray_isascii(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_isdigit(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_isdigit(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -1991,7 +1991,7 @@ bytearray_isdigit(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_islower(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_islower(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -2001,7 +2001,7 @@ bytearray_islower(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_isspace(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_isspace(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -2011,7 +2011,7 @@ bytearray_isspace(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_istitle(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_istitle(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -2021,7 +2021,7 @@ bytearray_istitle(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_isupper(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_isupper(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -2057,11 +2057,11 @@ bytearray_append_impl(PyByteArrayObject *self, int item) TyByteArray_AS_STRING(self)[n] = item; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -bytearray_capitalize(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_capitalize(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -2115,7 +2115,7 @@ bytearray_extend_impl(PyByteArrayObject *self, TyObject *iterable_of_ints) if (bytearray_setslice(self, Ty_SIZE(self), Ty_SIZE(self), iterable_of_ints) == -1) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } it = PyObject_GetIter(iterable_of_ints); @@ -2198,7 +2198,7 @@ bytearray_extend_impl(PyByteArrayObject *self, TyObject *iterable_of_ints) Ty_DECREF(bytearray_obj); assert(!TyErr_Occurred()); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2276,7 +2276,7 @@ bytearray_remove_impl(PyByteArrayObject *self, int value) if (bytearray_resize_lock_held((TyObject *)self, n - 1) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } #define LEFTSTRIP 0 @@ -2341,7 +2341,7 @@ bytearray_strip_impl(PyByteArrayObject *self, TyObject *bytes) } static TyObject * -bytearray_swapcase(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_swapcase(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -2351,7 +2351,7 @@ bytearray_swapcase(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_title(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_title(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -2361,7 +2361,7 @@ bytearray_title(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_upper(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_upper(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -2371,7 +2371,7 @@ bytearray_upper(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -bytearray_lower(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_lower(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *ret; Ty_BEGIN_CRITICAL_SECTION(self); @@ -2460,7 +2460,7 @@ PyDoc_STRVAR(alloc_doc, Return the number of bytes actually allocated."); static TyObject * -bytearray_alloc(TyObject *op, TyObject *Ty_UNUSED(ignored)) +bytearray_alloc(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyByteArrayObject *self = _PyByteArray_CAST(op); return TyLong_FromSsize_t(FT_ATOMIC_LOAD_SSIZE_RELAXED(self->ob_alloc)); @@ -2754,7 +2754,7 @@ bytearray_mod_lock_held(TyObject *v, TyObject *w) { _Ty_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(v); if (!TyByteArray_Check(v)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; return _TyBytes_FormatEx(TyByteArray_AS_STRING(v), TyByteArray_GET_SIZE(v), w, 1); } @@ -2905,7 +2905,7 @@ bytearrayiter_next(TyObject *self) } static TyObject * -bytearrayiter_length_hint(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearrayiter_length_hint(TyObject *self, TyObject *Py_UNUSED(ignored)) { bytesiterobject *it = _bytesiterobject_CAST(self); Ty_ssize_t len = 0; @@ -2923,7 +2923,7 @@ PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -bytearrayiter_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearrayiter_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *iter = _TyEval_GetBuiltin(&_Ty_ID(iter)); @@ -2959,7 +2959,7 @@ bytearrayiter_setstate(TyObject *self, TyObject *state) } FT_ATOMIC_STORE_SSIZE_RELAXED(it->it_index, index); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(setstate_doc, "Set state information for unpickling."); diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c index 7c075d4..8db88e9 100644 --- a/Objects/bytes_methods.c +++ b/Objects/bytes_methods.c @@ -17,18 +17,18 @@ _Ty_bytes_isspace(const char *cptr, Ty_ssize_t len) /* Shortcut for single character strings */ if (len == 1 && Ty_ISSPACE(*p)) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; /* Special case for empty strings */ if (len == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; e = p + len; for (; p < e; p++) { if (!Ty_ISSPACE(*p)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } @@ -47,18 +47,18 @@ _Ty_bytes_isalpha(const char *cptr, Ty_ssize_t len) /* Shortcut for single character strings */ if (len == 1 && Ty_ISALPHA(*p)) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; /* Special case for empty strings */ if (len == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; e = p + len; for (; p < e; p++) { if (!Ty_ISALPHA(*p)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } @@ -77,18 +77,18 @@ _Ty_bytes_isalnum(const char *cptr, Ty_ssize_t len) /* Shortcut for single character strings */ if (len == 1 && Ty_ISALNUM(*p)) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; /* Special case for empty strings */ if (len == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; e = p + len; for (; p < e; p++) { if (!Ty_ISALNUM(*p)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } @@ -107,18 +107,18 @@ _Ty_bytes_isdigit(const char *cptr, Ty_ssize_t len) /* Shortcut for single character strings */ if (len == 1 && Ty_ISDIGIT(*p)) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; /* Special case for empty strings */ if (len == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; e = p + len; for (; p < e; p++) { if (!Ty_ISDIGIT(*p)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } @@ -142,13 +142,13 @@ _Ty_bytes_islower(const char *cptr, Ty_ssize_t len) /* Special case for empty strings */ if (len == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; e = p + len; cased = 0; for (; p < e; p++) { if (Ty_ISUPPER(*p)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; else if (!cased && Ty_ISLOWER(*p)) cased = 1; } @@ -176,13 +176,13 @@ _Ty_bytes_isupper(const char *cptr, Ty_ssize_t len) /* Special case for empty strings */ if (len == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; e = p + len; cased = 0; for (; p < e; p++) { if (Ty_ISLOWER(*p)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; else if (!cased && Ty_ISUPPER(*p)) cased = 1; } @@ -208,14 +208,14 @@ _Ty_bytes_istitle(const char *cptr, Ty_ssize_t len) if (len == 1) { if (Ty_ISUPPER(*p)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /* Special case for empty strings */ if (len == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; e = p + len; cased = 0; @@ -225,13 +225,13 @@ _Ty_bytes_istitle(const char *cptr, Ty_ssize_t len) if (Ty_ISUPPER(ch)) { if (previous_is_cased) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; previous_is_cased = 1; cased = 1; } else if (Ty_ISLOWER(ch)) { if (!previous_is_cased) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; previous_is_cased = 1; cased = 1; } @@ -689,10 +689,10 @@ _Ty_bytes_tailmatch(const char *str, Ty_ssize_t len, return NULL; } else if (result) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } int result = tailmatch(str, len, subobj, start, end, direction); if (result == -1) { @@ -734,7 +734,7 @@ _Ty_bytes_isascii(const char *cptr, Ty_ssize_t len) const char *end = p + len; Ty_ssize_t max_char = stringlib_find_max_char(cptr, end); if (max_char > 127) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 7396727..31ef132 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -1196,8 +1196,8 @@ TyObject *_TyBytes_DecodeEscape2(const char *s, TyObject *TyBytes_DecodeEscape(const char *s, Ty_ssize_t len, const char *errors, - Ty_ssize_t Ty_UNUSED(unicode), - const char *Ty_UNUSED(recode_encoding)) + Ty_ssize_t Py_UNUSED(unicode), + const char *Py_UNUSED(recode_encoding)) { int first_invalid_escape_char; const char *first_invalid_escape_ptr; @@ -1558,7 +1558,7 @@ bytes_richcompare(TyObject *aa, TyObject *bb, int op) { /* Make sure both arguments are strings. */ if (!(TyBytes_Check(aa) && TyBytes_Check(bb))) { - if (_Ty_GetConfig()->bytes_warning && (op == Ty_EQ || op == Ty_NE)) { + if (_Ty_GetConfig()->bytes_warning && (op == Py_EQ || op == Py_NE)) { if (TyUnicode_Check(aa) || TyUnicode_Check(bb)) { if (TyErr_WarnEx(TyExc_BytesWarning, "Comparison between bytes and string", 1)) @@ -1570,30 +1570,30 @@ bytes_richcompare(TyObject *aa, TyObject *bb, int op) return NULL; } } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } PyBytesObject *a = _TyBytes_CAST(aa); PyBytesObject *b = _TyBytes_CAST(bb); if (a == b) { switch (op) { - case Ty_EQ: - case Ty_LE: - case Ty_GE: + case Py_EQ: + case Py_LE: + case Py_GE: /* a byte string is equal to itself */ - Ty_RETURN_TRUE; - case Ty_NE: - case Ty_LT: - case Ty_GT: - Ty_RETURN_FALSE; + Py_RETURN_TRUE; + case Py_NE: + case Py_LT: + case Py_GT: + Py_RETURN_FALSE; default: TyErr_BadArgument(); return NULL; } } - else if (op == Ty_EQ || op == Ty_NE) { + else if (op == Py_EQ || op == Py_NE) { int eq = bytes_compare_eq(a, b); - eq ^= (op == Ty_NE); + eq ^= (op == Py_NE); return TyBool_FromLong(eq); } else { @@ -1610,9 +1610,9 @@ bytes_richcompare(TyObject *aa, TyObject *bb, int op) c = 0; } if (c != 0) { - Ty_RETURN_RICHCOMPARE(c, 0, op); + Py_RETURN_RICHCOMPARE(c, 0, op); } - Ty_RETURN_RICHCOMPARE(len_a, len_b, op); + Py_RETURN_RICHCOMPARE(len_a, len_b, op); } } @@ -2652,7 +2652,7 @@ bytes_hex_impl(PyBytesObject *self, TyObject *sep, int bytes_per_sep) } static TyObject * -bytes_getnewargs(TyObject *op, TyObject *Ty_UNUSED(dummy)) +bytes_getnewargs(TyObject *op, TyObject *Py_UNUSED(dummy)) { PyBytesObject *v = _TyBytes_CAST(op); return Ty_BuildValue("(y#)", v->ob_sval, Ty_SIZE(v)); @@ -2722,7 +2722,7 @@ static TyObject * bytes_mod(TyObject *self, TyObject *arg) { if (!TyBytes_Check(self)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } return _TyBytes_FormatEx(TyBytes_AS_STRING(self), TyBytes_GET_SIZE(self), arg, 0); @@ -3319,7 +3319,7 @@ striter_next(TyObject *op) } static TyObject * -striter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) +striter_len(TyObject *op, TyObject *Py_UNUSED(ignored)) { striterobject *it = _striterobject_CAST(op); Ty_ssize_t len = 0; @@ -3332,7 +3332,7 @@ PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -striter_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +striter_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { TyObject *iter = _TyEval_GetBuiltin(&_Ty_ID(iter)); @@ -3363,7 +3363,7 @@ striter_setstate(TyObject *op, TyObject *state) index = TyBytes_GET_SIZE(it->it_seq); /* iterator exhausted */ it->it_index = index; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(setstate_doc, "Set state information for unpickling."); diff --git a/Objects/cellobject.c b/Objects/cellobject.c index a2c5695..76b4907 100644 --- a/Objects/cellobject.c +++ b/Objects/cellobject.c @@ -5,7 +5,7 @@ #include "pycore_modsupport.h" // _TyArg_NoKeywords() #include "pycore_object.h" -#define _PyCell_CAST(op) _Ty_CAST(PyCellObject*, (op)) +#define _PyCell_CAST(op) _Py_CAST(PyCellObject*, (op)) TyObject * TyCell_New(TyObject *obj) @@ -89,7 +89,7 @@ cell_compare_impl(TyObject *a, TyObject *b, int op) return PyObject_RichCompare(a, b, op); } else { - Ty_RETURN_RICHCOMPARE(b == NULL, a == NULL, op); + Py_RETURN_RICHCOMPARE(b == NULL, a == NULL, op); } } @@ -101,7 +101,7 @@ cell_richcompare(TyObject *a, TyObject *b, int op) /* both arguments should be instances of PyCellObject */ if (!TyCell_Check(a) || !TyCell_Check(b)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } TyObject *a_ref = TyCell_GetRef((PyCellObject *)a); TyObject *b_ref = TyCell_GetRef((PyCellObject *)b); @@ -156,7 +156,7 @@ cell_get_contents(TyObject *self, void *closure) } static int -cell_set_contents(TyObject *self, TyObject *obj, void *Ty_UNUSED(ignored)) +cell_set_contents(TyObject *self, TyObject *obj, void *Py_UNUSED(ignored)) { PyCellObject *cell = _PyCell_CAST(self); Ty_XINCREF(obj); diff --git a/Objects/classobject.c b/Objects/classobject.c index 1e32aa9..dcb057e 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -12,7 +12,7 @@ #include "clinic/classobject.c.h" -#define _PyMethodObject_CAST(op) _Ty_CAST(PyMethodObject*, (op)) +#define _PyMethodObject_CAST(op) _Py_CAST(PyMethodObject*, (op)) #define TP_DESCR_GET(t) ((t)->tp_descr_get) /*[clinic input] @@ -159,9 +159,9 @@ static TyMethodDef method_methods[] = { #define MO_OFF(x) offsetof(PyMethodObject, x) static TyMemberDef method_memberlist[] = { - {"__func__", _Ty_T_OBJECT, MO_OFF(im_func), Ty_READONLY, + {"__func__", _Ty_T_OBJECT, MO_OFF(im_func), Py_READONLY, "the function (or other callable) implementing a method"}, - {"__self__", _Ty_T_OBJECT, MO_OFF(im_self), Ty_READONLY, + {"__self__", _Ty_T_OBJECT, MO_OFF(im_self), Py_READONLY, "the instance to which a method is bound"}, {NULL} /* Sentinel */ }; @@ -260,21 +260,21 @@ method_richcompare(TyObject *self, TyObject *other, int op) TyObject *res; int eq; - if ((op != Ty_EQ && op != Ty_NE) || + if ((op != Py_EQ && op != Py_NE) || !TyMethod_Check(self) || !TyMethod_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } a = (PyMethodObject *)self; b = (PyMethodObject *)other; - eq = PyObject_RichCompareBool(a->im_func, b->im_func, Ty_EQ); + eq = PyObject_RichCompareBool(a->im_func, b->im_func, Py_EQ); if (eq == 1) { eq = (a->im_self == b->im_self); } else if (eq < 0) return NULL; - if (op == Ty_EQ) + if (op == Py_EQ) res = eq ? Ty_True : Ty_False; else res = eq ? Ty_False : Ty_True; @@ -399,7 +399,7 @@ PyInstanceMethod_Function(TyObject *im) #define IMO_OFF(x) offsetof(PyInstanceMethodObject, x) static TyMemberDef instancemethod_memberlist[] = { - {"__func__", _Ty_T_OBJECT, IMO_OFF(func), Ty_READONLY, + {"__func__", _Ty_T_OBJECT, IMO_OFF(func), Py_READONLY, "the function (or other callable) implementing a method"}, {NULL} /* Sentinel */ }; @@ -479,18 +479,18 @@ instancemethod_richcompare(TyObject *self, TyObject *other, int op) TyObject *res; int eq; - if ((op != Ty_EQ && op != Ty_NE) || + if ((op != Py_EQ && op != Py_NE) || !PyInstanceMethod_Check(self) || !PyInstanceMethod_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } a = (PyInstanceMethodObject *)self; b = (PyInstanceMethodObject *)other; - eq = PyObject_RichCompareBool(a->func, b->func, Ty_EQ); + eq = PyObject_RichCompareBool(a->func, b->func, Py_EQ); if (eq < 0) return NULL; - if (op == Ty_EQ) + if (op == Py_EQ) res = eq ? Ty_True : Ty_False; else res = eq ? Ty_False : Ty_True; diff --git a/Objects/clinic/bytearrayobject.c.h b/Objects/clinic/bytearrayobject.c.h index cabc540..1a16baf 100644 --- a/Objects/clinic/bytearrayobject.c.h +++ b/Objects/clinic/bytearrayobject.c.h @@ -222,7 +222,7 @@ static TyObject * bytearray_clear_impl(PyByteArrayObject *self); static TyObject * -bytearray_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { return bytearray_clear_impl((PyByteArrayObject *)self); } @@ -240,7 +240,7 @@ static TyObject * bytearray_copy_impl(PyByteArrayObject *self); static TyObject * -bytearray_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1085,7 +1085,7 @@ static TyObject * bytearray_reverse_impl(PyByteArrayObject *self); static TyObject * -bytearray_reverse(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_reverse(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1731,7 +1731,7 @@ static TyObject * bytearray_reduce_impl(PyByteArrayObject *self); static TyObject * -bytearray_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -1792,7 +1792,7 @@ static TyObject * bytearray_sizeof_impl(PyByteArrayObject *self); static TyObject * -bytearray_sizeof(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytearray_sizeof(TyObject *self, TyObject *Py_UNUSED(ignored)) { return bytearray_sizeof_impl((PyByteArrayObject *)self); } diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h index c57909e..d5c2467 100644 --- a/Objects/clinic/bytesobject.c.h +++ b/Objects/clinic/bytesobject.c.h @@ -22,7 +22,7 @@ static TyObject * bytes___bytes___impl(PyBytesObject *self); static TyObject * -bytes___bytes__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +bytes___bytes__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return bytes___bytes___impl((PyBytesObject *)self); } diff --git a/Objects/clinic/classobject.c.h b/Objects/clinic/classobject.c.h index 07d0ad8..4ff8086 100644 --- a/Objects/clinic/classobject.c.h +++ b/Objects/clinic/classobject.c.h @@ -16,7 +16,7 @@ static TyObject * method___reduce___impl(PyMethodObject *self); static TyObject * -method___reduce__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +method___reduce__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return method___reduce___impl((PyMethodObject *)self); } diff --git a/Objects/clinic/complexobject.c.h b/Objects/clinic/complexobject.c.h index b824b7f..389225e 100644 --- a/Objects/clinic/complexobject.c.h +++ b/Objects/clinic/complexobject.c.h @@ -21,7 +21,7 @@ static TyObject * complex_conjugate_impl(PyComplexObject *self); static TyObject * -complex_conjugate(TyObject *self, TyObject *Ty_UNUSED(ignored)) +complex_conjugate(TyObject *self, TyObject *Py_UNUSED(ignored)) { return complex_conjugate_impl((PyComplexObject *)self); } @@ -38,7 +38,7 @@ static TyObject * complex___getnewargs___impl(PyComplexObject *self); static TyObject * -complex___getnewargs__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +complex___getnewargs__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return complex___getnewargs___impl((PyComplexObject *)self); } @@ -85,7 +85,7 @@ static TyObject * complex___complex___impl(PyComplexObject *self); static TyObject * -complex___complex__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +complex___complex__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return complex___complex___impl((PyComplexObject *)self); } diff --git a/Objects/clinic/dictobject.c.h b/Objects/clinic/dictobject.c.h index a59abfa..18aebcd 100644 --- a/Objects/clinic/dictobject.c.h +++ b/Objects/clinic/dictobject.c.h @@ -52,7 +52,7 @@ static TyObject * dict_copy_impl(PyDictObject *self); static TyObject * -dict_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dict_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { return dict_copy_impl((PyDictObject *)self); } @@ -165,7 +165,7 @@ static TyObject * dict_clear_impl(PyDictObject *self); static TyObject * -dict_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dict_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { return dict_clear_impl((PyDictObject *)self); } @@ -223,7 +223,7 @@ static TyObject * dict_popitem_impl(PyDictObject *self); static TyObject * -dict_popitem(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dict_popitem(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -247,7 +247,7 @@ static TyObject * dict___sizeof___impl(PyDictObject *self); static TyObject * -dict___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dict___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return dict___sizeof___impl((PyDictObject *)self); } @@ -265,7 +265,7 @@ static TyObject * dict___reversed___impl(PyDictObject *self); static TyObject * -dict___reversed__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dict___reversed__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return dict___reversed___impl((PyDictObject *)self); } @@ -283,7 +283,7 @@ static TyObject * dict_keys_impl(PyDictObject *self); static TyObject * -dict_keys(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dict_keys(TyObject *self, TyObject *Py_UNUSED(ignored)) { return dict_keys_impl((PyDictObject *)self); } @@ -301,7 +301,7 @@ static TyObject * dict_items_impl(PyDictObject *self); static TyObject * -dict_items(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dict_items(TyObject *self, TyObject *Py_UNUSED(ignored)) { return dict_items_impl((PyDictObject *)self); } @@ -319,7 +319,7 @@ static TyObject * dict_values_impl(PyDictObject *self); static TyObject * -dict_values(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dict_values(TyObject *self, TyObject *Py_UNUSED(ignored)) { return dict_values_impl((PyDictObject *)self); } diff --git a/Objects/clinic/exceptions.c.h b/Objects/clinic/exceptions.c.h index 1f2ecef..c59b615 100644 --- a/Objects/clinic/exceptions.c.h +++ b/Objects/clinic/exceptions.c.h @@ -17,7 +17,7 @@ static TyObject * BaseException___reduce___impl(PyBaseExceptionObject *self); static TyObject * -BaseException___reduce__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +BaseException___reduce__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -120,7 +120,7 @@ static TyObject * BaseException_args_get_impl(PyBaseExceptionObject *self); static TyObject * -BaseException_args_get(TyObject *self, void *Ty_UNUSED(context)) +BaseException_args_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -145,7 +145,7 @@ static int BaseException_args_set_impl(PyBaseExceptionObject *self, TyObject *value); static int -BaseException_args_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +BaseException_args_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -170,7 +170,7 @@ static TyObject * BaseException___traceback___get_impl(PyBaseExceptionObject *self); static TyObject * -BaseException___traceback___get(TyObject *self, void *Ty_UNUSED(context)) +BaseException___traceback___get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -196,7 +196,7 @@ BaseException___traceback___set_impl(PyBaseExceptionObject *self, TyObject *value); static int -BaseException___traceback___set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +BaseException___traceback___set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -221,7 +221,7 @@ static TyObject * BaseException___context___get_impl(PyBaseExceptionObject *self); static TyObject * -BaseException___context___get(TyObject *self, void *Ty_UNUSED(context)) +BaseException___context___get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -247,7 +247,7 @@ BaseException___context___set_impl(PyBaseExceptionObject *self, TyObject *value); static int -BaseException___context___set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +BaseException___context___set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -272,7 +272,7 @@ static TyObject * BaseException___cause___get_impl(PyBaseExceptionObject *self); static TyObject * -BaseException___cause___get(TyObject *self, void *Ty_UNUSED(context)) +BaseException___cause___get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -298,7 +298,7 @@ BaseException___cause___set_impl(PyBaseExceptionObject *self, TyObject *value); static int -BaseException___cause___set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +BaseException___cause___set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; diff --git a/Objects/clinic/floatobject.c.h b/Objects/clinic/floatobject.c.h index ab9c869..ec36cc1 100644 --- a/Objects/clinic/floatobject.c.h +++ b/Objects/clinic/floatobject.c.h @@ -17,7 +17,7 @@ static TyObject * float_is_integer_impl(TyObject *self); static TyObject * -float_is_integer(TyObject *self, TyObject *Ty_UNUSED(ignored)) +float_is_integer(TyObject *self, TyObject *Py_UNUSED(ignored)) { return float_is_integer_impl(self); } @@ -35,7 +35,7 @@ static TyObject * float___trunc___impl(TyObject *self); static TyObject * -float___trunc__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +float___trunc__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return float___trunc___impl(self); } @@ -53,7 +53,7 @@ static TyObject * float___floor___impl(TyObject *self); static TyObject * -float___floor__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +float___floor__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return float___floor___impl(self); } @@ -71,7 +71,7 @@ static TyObject * float___ceil___impl(TyObject *self); static TyObject * -float___ceil__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +float___ceil__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return float___ceil___impl(self); } @@ -123,7 +123,7 @@ static TyObject * float_conjugate_impl(TyObject *self); static TyObject * -float_conjugate(TyObject *self, TyObject *Ty_UNUSED(ignored)) +float_conjugate(TyObject *self, TyObject *Py_UNUSED(ignored)) { return float_conjugate_impl(self); } @@ -146,7 +146,7 @@ static TyObject * float_hex_impl(TyObject *self); static TyObject * -float_hex(TyObject *self, TyObject *Ty_UNUSED(ignored)) +float_hex(TyObject *self, TyObject *Py_UNUSED(ignored)) { return float_hex_impl(self); } @@ -201,7 +201,7 @@ static TyObject * float_as_integer_ratio_impl(TyObject *self); static TyObject * -float_as_integer_ratio(TyObject *self, TyObject *Ty_UNUSED(ignored)) +float_as_integer_ratio(TyObject *self, TyObject *Py_UNUSED(ignored)) { return float_as_integer_ratio_impl(self); } @@ -274,7 +274,7 @@ static TyObject * float___getnewargs___impl(TyObject *self); static TyObject * -float___getnewargs__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +float___getnewargs__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return float___getnewargs___impl(self); } diff --git a/Objects/clinic/frameobject.c.h b/Objects/clinic/frameobject.c.h index f28f12f..2a77865 100644 --- a/Objects/clinic/frameobject.c.h +++ b/Objects/clinic/frameobject.c.h @@ -25,7 +25,7 @@ static TyObject * frame_locals_get_impl(PyFrameObject *self); static TyObject * -frame_locals_get(TyObject *self, void *Ty_UNUSED(context)) +frame_locals_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -57,7 +57,7 @@ static TyObject * frame_lineno_get_impl(PyFrameObject *self); static TyObject * -frame_lineno_get(TyObject *self, void *Ty_UNUSED(context)) +frame_lineno_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -89,7 +89,7 @@ static TyObject * frame_lasti_get_impl(PyFrameObject *self); static TyObject * -frame_lasti_get(TyObject *self, void *Ty_UNUSED(context)) +frame_lasti_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -121,7 +121,7 @@ static TyObject * frame_globals_get_impl(PyFrameObject *self); static TyObject * -frame_globals_get(TyObject *self, void *Ty_UNUSED(context)) +frame_globals_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -153,7 +153,7 @@ static TyObject * frame_builtins_get_impl(PyFrameObject *self); static TyObject * -frame_builtins_get(TyObject *self, void *Ty_UNUSED(context)) +frame_builtins_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -185,7 +185,7 @@ static TyObject * frame_code_get_impl(PyFrameObject *self); static TyObject * -frame_code_get(TyObject *self, void *Ty_UNUSED(context)) +frame_code_get(TyObject *self, void *Py_UNUSED(context)) { return frame_code_get_impl((PyFrameObject *)self); } @@ -204,7 +204,7 @@ static TyObject * frame_back_get_impl(PyFrameObject *self); static TyObject * -frame_back_get(TyObject *self, void *Ty_UNUSED(context)) +frame_back_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -236,7 +236,7 @@ static TyObject * frame_trace_opcodes_get_impl(PyFrameObject *self); static TyObject * -frame_trace_opcodes_get(TyObject *self, void *Ty_UNUSED(context)) +frame_trace_opcodes_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -261,7 +261,7 @@ static int frame_trace_opcodes_set_impl(PyFrameObject *self, TyObject *value); static int -frame_trace_opcodes_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +frame_trace_opcodes_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -286,7 +286,7 @@ static int frame_lineno_set_impl(PyFrameObject *self, TyObject *value); static int -frame_lineno_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +frame_lineno_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -318,7 +318,7 @@ static TyObject * frame_trace_get_impl(PyFrameObject *self); static TyObject * -frame_trace_get(TyObject *self, void *Ty_UNUSED(context)) +frame_trace_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -343,7 +343,7 @@ static int frame_trace_set_impl(PyFrameObject *self, TyObject *value); static int -frame_trace_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +frame_trace_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -375,7 +375,7 @@ static TyObject * frame_generator_get_impl(PyFrameObject *self); static TyObject * -frame_generator_get(TyObject *self, void *Ty_UNUSED(context)) +frame_generator_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -399,7 +399,7 @@ static TyObject * frame_clear_impl(PyFrameObject *self); static TyObject * -frame_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +frame_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -423,7 +423,7 @@ static TyObject * frame___sizeof___impl(PyFrameObject *self); static TyObject * -frame___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +frame___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Objects/clinic/funcobject.c.h b/Objects/clinic/funcobject.c.h index adf6f90..6db5ffd 100644 --- a/Objects/clinic/funcobject.c.h +++ b/Objects/clinic/funcobject.c.h @@ -30,7 +30,7 @@ static TyObject * function___annotate___get_impl(PyFunctionObject *self); static TyObject * -function___annotate___get(TyObject *self, void *Ty_UNUSED(context)) +function___annotate___get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -55,7 +55,7 @@ static int function___annotate___set_impl(PyFunctionObject *self, TyObject *value); static int -function___annotate___set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +function___annotate___set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -87,7 +87,7 @@ static TyObject * function___annotations___get_impl(PyFunctionObject *self); static TyObject * -function___annotations___get(TyObject *self, void *Ty_UNUSED(context)) +function___annotations___get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -112,7 +112,7 @@ static int function___annotations___set_impl(PyFunctionObject *self, TyObject *value); static int -function___annotations___set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +function___annotations___set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; @@ -144,7 +144,7 @@ static TyObject * function___type_params___get_impl(PyFunctionObject *self); static TyObject * -function___type_params___get(TyObject *self, void *Ty_UNUSED(context)) +function___type_params___get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -169,7 +169,7 @@ static int function___type_params___set_impl(PyFunctionObject *self, TyObject *value); static int -function___type_params___set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +function___type_params___set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; diff --git a/Objects/clinic/listobject.c.h b/Objects/clinic/listobject.c.h index bdfe372..41885fd 100644 --- a/Objects/clinic/listobject.c.h +++ b/Objects/clinic/listobject.c.h @@ -66,7 +66,7 @@ static TyObject * py_list_clear_impl(PyListObject *self); static TyObject * -py_list_clear(TyObject *self, TyObject *Ty_UNUSED(ignored)) +py_list_clear(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -90,7 +90,7 @@ static TyObject * list_copy_impl(PyListObject *self); static TyObject * -list_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +list_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -290,7 +290,7 @@ static TyObject * list_reverse_impl(PyListObject *self); static TyObject * -list_reverse(TyObject *self, TyObject *Ty_UNUSED(ignored)) +list_reverse(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -446,7 +446,7 @@ static TyObject * list___sizeof___impl(PyListObject *self); static TyObject * -list___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +list___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return list___sizeof___impl((PyListObject *)self); } @@ -464,7 +464,7 @@ static TyObject * list___reversed___impl(PyListObject *self); static TyObject * -list___reversed__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +list___reversed__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return list___reversed___impl((PyListObject *)self); } diff --git a/Objects/clinic/longobject.c.h b/Objects/clinic/longobject.c.h index a9c1bc5..0a4bb7a 100644 --- a/Objects/clinic/longobject.c.h +++ b/Objects/clinic/longobject.c.h @@ -84,7 +84,7 @@ static TyObject * int___getnewargs___impl(TyObject *self); static TyObject * -int___getnewargs__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +int___getnewargs__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return int___getnewargs___impl(self); } @@ -165,7 +165,7 @@ static Ty_ssize_t int___sizeof___impl(TyObject *self); static TyObject * -int___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +int___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; Ty_ssize_t _return_value; @@ -198,7 +198,7 @@ static TyObject * int_bit_length_impl(TyObject *self); static TyObject * -int_bit_length(TyObject *self, TyObject *Ty_UNUSED(ignored)) +int_bit_length(TyObject *self, TyObject *Py_UNUSED(ignored)) { return int_bit_length_impl(self); } @@ -223,7 +223,7 @@ static TyObject * int_bit_count_impl(TyObject *self); static TyObject * -int_bit_count(TyObject *self, TyObject *Ty_UNUSED(ignored)) +int_bit_count(TyObject *self, TyObject *Py_UNUSED(ignored)) { return int_bit_count_impl(self); } @@ -250,7 +250,7 @@ static TyObject * int_as_integer_ratio_impl(TyObject *self); static TyObject * -int_as_integer_ratio(TyObject *self, TyObject *Ty_UNUSED(ignored)) +int_as_integer_ratio(TyObject *self, TyObject *Py_UNUSED(ignored)) { return int_as_integer_ratio_impl(self); } @@ -481,7 +481,7 @@ static TyObject * int_is_integer_impl(TyObject *self); static TyObject * -int_is_integer(TyObject *self, TyObject *Ty_UNUSED(ignored)) +int_is_integer(TyObject *self, TyObject *Py_UNUSED(ignored)) { return int_is_integer_impl(self); } diff --git a/Objects/clinic/memoryobject.c.h b/Objects/clinic/memoryobject.c.h index a9d3f91..cc9a3e4 100644 --- a/Objects/clinic/memoryobject.c.h +++ b/Objects/clinic/memoryobject.c.h @@ -141,7 +141,7 @@ static TyObject * memoryview_release_impl(PyMemoryViewObject *self); static TyObject * -memoryview_release(TyObject *self, TyObject *Ty_UNUSED(ignored)) +memoryview_release(TyObject *self, TyObject *Py_UNUSED(ignored)) { return memoryview_release_impl((PyMemoryViewObject *)self); } @@ -229,7 +229,7 @@ static TyObject * memoryview_toreadonly_impl(PyMemoryViewObject *self); static TyObject * -memoryview_toreadonly(TyObject *self, TyObject *Ty_UNUSED(ignored)) +memoryview_toreadonly(TyObject *self, TyObject *Py_UNUSED(ignored)) { return memoryview_toreadonly_impl((PyMemoryViewObject *)self); } @@ -247,7 +247,7 @@ static TyObject * memoryview_tolist_impl(PyMemoryViewObject *self); static TyObject * -memoryview_tolist(TyObject *self, TyObject *Ty_UNUSED(ignored)) +memoryview_tolist(TyObject *self, TyObject *Py_UNUSED(ignored)) { return memoryview_tolist_impl((PyMemoryViewObject *)self); } diff --git a/Objects/clinic/setobject.c.h b/Objects/clinic/setobject.c.h index ad1ccf3..7816b8e 100644 --- a/Objects/clinic/setobject.c.h +++ b/Objects/clinic/setobject.c.h @@ -19,7 +19,7 @@ static TyObject * set_pop_impl(PySetObject *so); static TyObject * -set_pop(TyObject *so, TyObject *Ty_UNUSED(ignored)) +set_pop(TyObject *so, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -70,7 +70,7 @@ static TyObject * set_copy_impl(PySetObject *so); static TyObject * -set_copy(TyObject *so, TyObject *Ty_UNUSED(ignored)) +set_copy(TyObject *so, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -94,7 +94,7 @@ static TyObject * frozenset_copy_impl(PySetObject *so); static TyObject * -frozenset_copy(TyObject *so, TyObject *Ty_UNUSED(ignored)) +frozenset_copy(TyObject *so, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -118,7 +118,7 @@ static TyObject * set_clear_impl(PySetObject *so); static TyObject * -set_clear(TyObject *so, TyObject *Ty_UNUSED(ignored)) +set_clear(TyObject *so, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -520,7 +520,7 @@ static TyObject * set___reduce___impl(PySetObject *so); static TyObject * -set___reduce__(TyObject *so, TyObject *Ty_UNUSED(ignored)) +set___reduce__(TyObject *so, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; @@ -544,7 +544,7 @@ static TyObject * set___sizeof___impl(PySetObject *so); static TyObject * -set___sizeof__(TyObject *so, TyObject *Ty_UNUSED(ignored)) +set___sizeof__(TyObject *so, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; diff --git a/Objects/clinic/tupleobject.c.h b/Objects/clinic/tupleobject.c.h index 67c787c..5c0e903 100644 --- a/Objects/clinic/tupleobject.c.h +++ b/Objects/clinic/tupleobject.c.h @@ -123,7 +123,7 @@ static TyObject * tuple___getnewargs___impl(PyTupleObject *self); static TyObject * -tuple___getnewargs__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +tuple___getnewargs__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return tuple___getnewargs___impl((PyTupleObject *)self); } diff --git a/Objects/clinic/typeobject.c.h b/Objects/clinic/typeobject.c.h index 593ae1f..97b0095 100644 --- a/Objects/clinic/typeobject.c.h +++ b/Objects/clinic/typeobject.c.h @@ -73,7 +73,7 @@ static TyObject * type_mro_impl(TyTypeObject *self); static TyObject * -type_mro(TyObject *self, TyObject *Ty_UNUSED(ignored)) +type_mro(TyObject *self, TyObject *Py_UNUSED(ignored)) { return type_mro_impl((TyTypeObject *)self); } @@ -91,7 +91,7 @@ static TyObject * type___subclasses___impl(TyTypeObject *self); static TyObject * -type___subclasses__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +type___subclasses__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return type___subclasses___impl((TyTypeObject *)self); } @@ -109,7 +109,7 @@ static TyObject * type___dir___impl(TyTypeObject *self); static TyObject * -type___dir__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +type___dir__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return type___dir___impl((TyTypeObject *)self); } @@ -127,7 +127,7 @@ static TyObject * type___sizeof___impl(TyTypeObject *self); static TyObject * -type___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +type___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return type___sizeof___impl((TyTypeObject *)self); } @@ -145,7 +145,7 @@ static TyObject * object___getstate___impl(TyObject *self); static TyObject * -object___getstate__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +object___getstate__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return object___getstate___impl(self); } @@ -163,7 +163,7 @@ static TyObject * object___reduce___impl(TyObject *self); static TyObject * -object___reduce__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +object___reduce__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return object___reduce___impl(self); } @@ -240,7 +240,7 @@ static TyObject * object___sizeof___impl(TyObject *self); static TyObject * -object___sizeof__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +object___sizeof__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return object___sizeof___impl(self); } @@ -258,7 +258,7 @@ static TyObject * object___dir___impl(TyObject *self); static TyObject * -object___dir__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +object___dir__(TyObject *self, TyObject *Py_UNUSED(ignored)) { return object___dir___impl(self); } diff --git a/Objects/clinic/typevarobject.c.h b/Objects/clinic/typevarobject.c.h index 03de534..02376d8 100644 --- a/Objects/clinic/typevarobject.c.h +++ b/Objects/clinic/typevarobject.c.h @@ -187,7 +187,7 @@ static TyObject * typevar_reduce_impl(typevarobject *self); static TyObject * -typevar_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +typevar_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { return typevar_reduce_impl((typevarobject *)self); } @@ -204,7 +204,7 @@ static TyObject * typevar_has_default_impl(typevarobject *self); static TyObject * -typevar_has_default(TyObject *self, TyObject *Ty_UNUSED(ignored)) +typevar_has_default(TyObject *self, TyObject *Py_UNUSED(ignored)) { return typevar_has_default_impl((typevarobject *)self); } @@ -494,7 +494,7 @@ static TyObject * paramspec_reduce_impl(paramspecobject *self); static TyObject * -paramspec_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +paramspec_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { return paramspec_reduce_impl((paramspecobject *)self); } @@ -511,7 +511,7 @@ static TyObject * paramspec_has_default_impl(paramspecobject *self); static TyObject * -paramspec_has_default(TyObject *self, TyObject *Ty_UNUSED(ignored)) +paramspec_has_default(TyObject *self, TyObject *Py_UNUSED(ignored)) { return paramspec_has_default_impl((paramspecobject *)self); } @@ -648,7 +648,7 @@ static TyObject * typevartuple_reduce_impl(typevartupleobject *self); static TyObject * -typevartuple_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +typevartuple_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { return typevartuple_reduce_impl((typevartupleobject *)self); } @@ -665,7 +665,7 @@ static TyObject * typevartuple_has_default_impl(typevartupleobject *self); static TyObject * -typevartuple_has_default(TyObject *self, TyObject *Ty_UNUSED(ignored)) +typevartuple_has_default(TyObject *self, TyObject *Py_UNUSED(ignored)) { return typevartuple_has_default_impl((typevartupleobject *)self); } @@ -682,7 +682,7 @@ static TyObject * typealias_reduce_impl(typealiasobject *self); static TyObject * -typealias_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +typealias_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { return typealias_reduce_impl((typealiasobject *)self); } diff --git a/Objects/clinic/unicodeobject.c.h b/Objects/clinic/unicodeobject.c.h index e9ef854..02d66a1 100644 --- a/Objects/clinic/unicodeobject.c.h +++ b/Objects/clinic/unicodeobject.c.h @@ -22,7 +22,7 @@ static TyObject * EncodingMap_size_impl(struct encoding_map *self); static TyObject * -EncodingMap_size(TyObject *self, TyObject *Ty_UNUSED(ignored)) +EncodingMap_size(TyObject *self, TyObject *Py_UNUSED(ignored)) { return EncodingMap_size_impl((struct encoding_map *)self); } @@ -43,7 +43,7 @@ static TyObject * unicode_title_impl(TyObject *self); static TyObject * -unicode_title(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_title(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_title_impl(self); } @@ -64,7 +64,7 @@ static TyObject * unicode_capitalize_impl(TyObject *self); static TyObject * -unicode_capitalize(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_capitalize(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_capitalize_impl(self); } @@ -82,7 +82,7 @@ static TyObject * unicode_casefold_impl(TyObject *self); static TyObject * -unicode_casefold(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_casefold(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_casefold_impl(self); } @@ -490,7 +490,7 @@ static TyObject * unicode_isascii_impl(TyObject *self); static TyObject * -unicode_isascii(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isascii(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isascii_impl(self); } @@ -511,7 +511,7 @@ static TyObject * unicode_islower_impl(TyObject *self); static TyObject * -unicode_islower(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_islower(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_islower_impl(self); } @@ -532,7 +532,7 @@ static TyObject * unicode_isupper_impl(TyObject *self); static TyObject * -unicode_isupper(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isupper(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isupper_impl(self); } @@ -553,7 +553,7 @@ static TyObject * unicode_istitle_impl(TyObject *self); static TyObject * -unicode_istitle(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_istitle(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_istitle_impl(self); } @@ -574,7 +574,7 @@ static TyObject * unicode_isspace_impl(TyObject *self); static TyObject * -unicode_isspace(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isspace(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isspace_impl(self); } @@ -595,7 +595,7 @@ static TyObject * unicode_isalpha_impl(TyObject *self); static TyObject * -unicode_isalpha(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isalpha(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isalpha_impl(self); } @@ -616,7 +616,7 @@ static TyObject * unicode_isalnum_impl(TyObject *self); static TyObject * -unicode_isalnum(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isalnum(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isalnum_impl(self); } @@ -637,7 +637,7 @@ static TyObject * unicode_isdecimal_impl(TyObject *self); static TyObject * -unicode_isdecimal(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isdecimal(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isdecimal_impl(self); } @@ -658,7 +658,7 @@ static TyObject * unicode_isdigit_impl(TyObject *self); static TyObject * -unicode_isdigit(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isdigit(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isdigit_impl(self); } @@ -679,7 +679,7 @@ static TyObject * unicode_isnumeric_impl(TyObject *self); static TyObject * -unicode_isnumeric(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isnumeric(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isnumeric_impl(self); } @@ -700,7 +700,7 @@ static TyObject * unicode_isidentifier_impl(TyObject *self); static TyObject * -unicode_isidentifier(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isidentifier(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isidentifier_impl(self); } @@ -720,7 +720,7 @@ static TyObject * unicode_isprintable_impl(TyObject *self); static TyObject * -unicode_isprintable(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_isprintable(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_isprintable_impl(self); } @@ -801,7 +801,7 @@ static TyObject * unicode_lower_impl(TyObject *self); static TyObject * -unicode_lower(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_lower(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_lower_impl(self); } @@ -1532,7 +1532,7 @@ static TyObject * unicode_swapcase_impl(TyObject *self); static TyObject * -unicode_swapcase(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_swapcase(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_swapcase_impl(self); } @@ -1622,7 +1622,7 @@ static TyObject * unicode_upper_impl(TyObject *self); static TyObject * -unicode_upper(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_upper(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_upper_impl(self); } @@ -1809,7 +1809,7 @@ static TyObject * unicode_sizeof_impl(TyObject *self); static TyObject * -unicode_sizeof(TyObject *self, TyObject *Ty_UNUSED(ignored)) +unicode_sizeof(TyObject *self, TyObject *Py_UNUSED(ignored)) { return unicode_sizeof_impl(self); } diff --git a/Objects/codeobject.c b/Objects/codeobject.c index 126f6a4..7e9f351 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -1367,7 +1367,7 @@ static TyObject * _source_offset_converter(void *arg) { int *value = (int*)arg; if (*value == -1) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyLong_FromLong(*value); } @@ -1530,7 +1530,7 @@ TyTypeObject _PyPositionsIterator = { }; static TyObject* -code_positionsiterator(TyObject *self, TyObject* Ty_UNUSED(args)) +code_positionsiterator(TyObject *self, TyObject* Py_UNUSED(args)) { PyCodeObject *code = (PyCodeObject*)self; positionsiterator* pi = (positionsiterator*)TyType_GenericAlloc(&_PyPositionsIterator, 0); @@ -2491,16 +2491,16 @@ code_richcompare(TyObject *self, TyObject *other, int op) TyObject *consts1, *consts2; TyObject *res; - if ((op != Ty_EQ && op != Ty_NE) || + if ((op != Py_EQ && op != Py_NE) || !TyCode_Check(self) || !TyCode_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } co = (PyCodeObject *)self; cp = (PyCodeObject *)other; - eq = PyObject_RichCompareBool(co->co_name, cp->co_name, Ty_EQ); + eq = PyObject_RichCompareBool(co->co_name, cp->co_name, Py_EQ); if (!eq) goto unequal; eq = co->co_argcount == cp->co_argcount; if (!eq) goto unequal; @@ -2534,27 +2534,27 @@ code_richcompare(TyObject *self, TyObject *other, int op) Ty_DECREF(consts1); return NULL; } - eq = PyObject_RichCompareBool(consts1, consts2, Ty_EQ); + eq = PyObject_RichCompareBool(consts1, consts2, Py_EQ); Ty_DECREF(consts1); Ty_DECREF(consts2); if (eq <= 0) goto unequal; - eq = PyObject_RichCompareBool(co->co_names, cp->co_names, Ty_EQ); + eq = PyObject_RichCompareBool(co->co_names, cp->co_names, Py_EQ); if (eq <= 0) goto unequal; eq = PyObject_RichCompareBool(co->co_localsplusnames, - cp->co_localsplusnames, Ty_EQ); + cp->co_localsplusnames, Py_EQ); if (eq <= 0) goto unequal; - eq = PyObject_RichCompareBool(co->co_linetable, cp->co_linetable, Ty_EQ); + eq = PyObject_RichCompareBool(co->co_linetable, cp->co_linetable, Py_EQ); if (eq <= 0) { goto unequal; } eq = PyObject_RichCompareBool(co->co_exceptiontable, - cp->co_exceptiontable, Ty_EQ); + cp->co_exceptiontable, Py_EQ); if (eq <= 0) { goto unequal; } - if (op == Ty_EQ) + if (op == Py_EQ) res = Ty_True; else res = Ty_False; @@ -2563,7 +2563,7 @@ code_richcompare(TyObject *self, TyObject *other, int op) unequal: if (eq < 0) return NULL; - if (op == Ty_NE) + if (op == Py_NE) res = Ty_True; else res = Ty_False; @@ -2617,20 +2617,20 @@ code_hash(TyObject *self) #define OFF(x) offsetof(PyCodeObject, x) static TyMemberDef code_memberlist[] = { - {"co_argcount", Ty_T_INT, OFF(co_argcount), Ty_READONLY}, - {"co_posonlyargcount", Ty_T_INT, OFF(co_posonlyargcount), Ty_READONLY}, - {"co_kwonlyargcount", Ty_T_INT, OFF(co_kwonlyargcount), Ty_READONLY}, - {"co_stacksize", Ty_T_INT, OFF(co_stacksize), Ty_READONLY}, - {"co_flags", Ty_T_INT, OFF(co_flags), Ty_READONLY}, - {"co_nlocals", Ty_T_INT, OFF(co_nlocals), Ty_READONLY}, - {"co_consts", _Ty_T_OBJECT, OFF(co_consts), Ty_READONLY}, - {"co_names", _Ty_T_OBJECT, OFF(co_names), Ty_READONLY}, - {"co_filename", _Ty_T_OBJECT, OFF(co_filename), Ty_READONLY}, - {"co_name", _Ty_T_OBJECT, OFF(co_name), Ty_READONLY}, - {"co_qualname", _Ty_T_OBJECT, OFF(co_qualname), Ty_READONLY}, - {"co_firstlineno", Ty_T_INT, OFF(co_firstlineno), Ty_READONLY}, - {"co_linetable", _Ty_T_OBJECT, OFF(co_linetable), Ty_READONLY}, - {"co_exceptiontable", _Ty_T_OBJECT, OFF(co_exceptiontable), Ty_READONLY}, + {"co_argcount", Ty_T_INT, OFF(co_argcount), Py_READONLY}, + {"co_posonlyargcount", Ty_T_INT, OFF(co_posonlyargcount), Py_READONLY}, + {"co_kwonlyargcount", Ty_T_INT, OFF(co_kwonlyargcount), Py_READONLY}, + {"co_stacksize", Ty_T_INT, OFF(co_stacksize), Py_READONLY}, + {"co_flags", Ty_T_INT, OFF(co_flags), Py_READONLY}, + {"co_nlocals", Ty_T_INT, OFF(co_nlocals), Py_READONLY}, + {"co_consts", _Ty_T_OBJECT, OFF(co_consts), Py_READONLY}, + {"co_names", _Ty_T_OBJECT, OFF(co_names), Py_READONLY}, + {"co_filename", _Ty_T_OBJECT, OFF(co_filename), Py_READONLY}, + {"co_name", _Ty_T_OBJECT, OFF(co_name), Py_READONLY}, + {"co_qualname", _Ty_T_OBJECT, OFF(co_qualname), Py_READONLY}, + {"co_firstlineno", Ty_T_INT, OFF(co_firstlineno), Py_READONLY}, + {"co_linetable", _Ty_T_OBJECT, OFF(co_linetable), Py_READONLY}, + {"co_exceptiontable", _Ty_T_OBJECT, OFF(co_exceptiontable), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -2696,7 +2696,7 @@ static TyGetSetDef code_getsetlist[] = { static TyObject * -code_sizeof(TyObject *self, TyObject *Ty_UNUSED(args)) +code_sizeof(TyObject *self, TyObject *Py_UNUSED(args)) { PyCodeObject *co = _PyCodeObject_CAST(self); size_t res = _TyObject_VAR_SIZE(Ty_TYPE(co), Ty_SIZE(co)); @@ -2709,14 +2709,14 @@ code_sizeof(TyObject *self, TyObject *Ty_UNUSED(args)) } static TyObject * -code_linesiterator(TyObject *self, TyObject *Ty_UNUSED(args)) +code_linesiterator(TyObject *self, TyObject *Py_UNUSED(args)) { PyCodeObject *code = _PyCodeObject_CAST(self); return (TyObject *)new_linesiterator(code); } static TyObject * -code_branchesiterator(TyObject *self, TyObject *Ty_UNUSED(args)) +code_branchesiterator(TyObject *self, TyObject *Py_UNUSED(args)) { PyCodeObject *code = _PyCodeObject_CAST(self); return _PyInstrumentation_BranchesIterator(code); @@ -3171,7 +3171,7 @@ compare_constants(const void *key1, const void *key2) s1->step == s2->step); } else if (TyBytes_CheckExact(op1) || TyLong_CheckExact(op1)) { - return PyObject_RichCompareBool(op1, op2, Ty_EQ); + return PyObject_RichCompareBool(op1, op2, Py_EQ); } else if (TyFloat_CheckExact(op1)) { // Ensure that, for example, +0.0 and -0.0 are distinct diff --git a/Objects/complexobject.c b/Objects/complexobject.c index e942d84..2680ebf 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -697,7 +697,7 @@ real_to_complex(TyObject **pobj, Ty_complex *pc) } \ } \ else if (!TyComplex_Check(v)) { \ - Ty_RETURN_NOTIMPLEMENTED; \ + Py_RETURN_NOTIMPLEMENTED; \ } \ else { \ a = ((PyComplexObject *)v)->cval; \ @@ -803,7 +803,7 @@ complex_richcompare(TyObject *v, TyObject *w, int op) Ty_complex i; int equal; - if (op != Ty_EQ && op != Ty_NE) { + if (op != Py_EQ && op != Py_NE) { goto Unimplemented; } @@ -841,7 +841,7 @@ complex_richcompare(TyObject *v, TyObject *w, int op) goto Unimplemented; } - if (equal == (op == Ty_EQ)) + if (equal == (op == Py_EQ)) res = Ty_True; else res = Ty_False; @@ -849,7 +849,7 @@ complex_richcompare(TyObject *v, TyObject *w, int op) return Ty_NewRef(res); Unimplemented: - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } /*[clinic input] @@ -1335,9 +1335,9 @@ static TyMethodDef complex_methods[] = { }; static TyMemberDef complex_members[] = { - {"real", Ty_T_DOUBLE, offsetof(PyComplexObject, cval.real), Ty_READONLY, + {"real", Ty_T_DOUBLE, offsetof(PyComplexObject, cval.real), Py_READONLY, "the real part of a complex number"}, - {"imag", Ty_T_DOUBLE, offsetof(PyComplexObject, cval.imag), Ty_READONLY, + {"imag", Ty_T_DOUBLE, offsetof(PyComplexObject, cval.imag), Py_READONLY, "the imaginary part of a complex number"}, {0}, }; diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 453a0b1..a851930 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -618,7 +618,7 @@ calculate_qualname(PyDescrObject *descr) } static TyObject * -descr_get_qualname(TyObject *self, void *Ty_UNUSED(ignored)) +descr_get_qualname(TyObject *self, void *Py_UNUSED(ignored)) { PyDescrObject *descr = (PyDescrObject *)self; if (descr->d_qualname == NULL) @@ -627,7 +627,7 @@ descr_get_qualname(TyObject *self, void *Ty_UNUSED(ignored)) } static TyObject * -descr_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +descr_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyDescrObject *descr = (PyDescrObject *)self; return Ty_BuildValue("N(OO)", _TyEval_GetBuiltin(&_Ty_ID(getattr)), @@ -640,8 +640,8 @@ static TyMethodDef descr_methods[] = { }; static TyMemberDef descr_members[] = { - {"__objclass__", _Ty_T_OBJECT, offsetof(PyDescrObject, d_type), Ty_READONLY}, - {"__name__", _Ty_T_OBJECT, offsetof(PyDescrObject, d_name), Ty_READONLY}, + {"__objclass__", _Ty_T_OBJECT, offsetof(PyDescrObject, d_type), Py_READONLY}, + {"__name__", _Ty_T_OBJECT, offsetof(PyDescrObject, d_name), Py_READONLY}, {0} }; @@ -657,7 +657,7 @@ member_get_doc(TyObject *_descr, void *closure) { PyMemberDescrObject *descr = (PyMemberDescrObject *)_descr; if (descr->d_member->doc == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyUnicode_FromString(descr->d_member->doc); } @@ -673,7 +673,7 @@ getset_get_doc(TyObject *self, void *closure) { PyGetSetDescrObject *descr = (PyGetSetDescrObject *)self; if (descr->d_getset->doc == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyUnicode_FromString(descr->d_getset->doc); } @@ -1074,7 +1074,7 @@ mappingproxy_or(TyObject *left, TyObject *right) } static TyObject * -mappingproxy_ior(TyObject *self, TyObject *Ty_UNUSED(other)) +mappingproxy_ior(TyObject *self, TyObject *Py_UNUSED(other)) { return TyErr_Format(TyExc_TypeError, "'|=' is not supported by %s; use '|' instead", Ty_TYPE(self)->tp_name); @@ -1128,35 +1128,35 @@ mappingproxy_get(TyObject *self, TyObject *const *args, Ty_ssize_t nargs) } static TyObject * -mappingproxy_keys(TyObject *self, TyObject *Ty_UNUSED(ignored)) +mappingproxy_keys(TyObject *self, TyObject *Py_UNUSED(ignored)) { mappingproxyobject *pp = (mappingproxyobject *)self; return PyObject_CallMethodNoArgs(pp->mapping, &_Ty_ID(keys)); } static TyObject * -mappingproxy_values(TyObject *self, TyObject *Ty_UNUSED(ignored)) +mappingproxy_values(TyObject *self, TyObject *Py_UNUSED(ignored)) { mappingproxyobject *pp = (mappingproxyobject *)self; return PyObject_CallMethodNoArgs(pp->mapping, &_Ty_ID(values)); } static TyObject * -mappingproxy_items(TyObject *self, TyObject *Ty_UNUSED(ignored)) +mappingproxy_items(TyObject *self, TyObject *Py_UNUSED(ignored)) { mappingproxyobject *pp = (mappingproxyobject *)self; return PyObject_CallMethodNoArgs(pp->mapping, &_Ty_ID(items)); } static TyObject * -mappingproxy_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +mappingproxy_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { mappingproxyobject *pp = (mappingproxyobject *)self; return PyObject_CallMethodNoArgs(pp->mapping, &_Ty_ID(copy)); } static TyObject * -mappingproxy_reversed(TyObject *self, TyObject *Ty_UNUSED(ignored)) +mappingproxy_reversed(TyObject *self, TyObject *Py_UNUSED(ignored)) { mappingproxyobject *pp = (mappingproxyobject *)self; return PyObject_CallMethodNoArgs(pp->mapping, &_Ty_ID(__reversed__)); @@ -1325,20 +1325,20 @@ wrapper_richcompare(TyObject *a, TyObject *b, int op) assert(a != NULL && b != NULL); /* both arguments should be wrapperobjects */ - if ((op != Ty_EQ && op != Ty_NE) + if ((op != Py_EQ && op != Py_NE) || !Wrapper_Check(a) || !Wrapper_Check(b)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } wa = (wrapperobject *)a; wb = (wrapperobject *)b; eq = (wa->descr == wb->descr && wa->self == wb->self); - if (eq == (op == Ty_EQ)) { - Ty_RETURN_TRUE; + if (eq == (op == Py_EQ)) { + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } @@ -1366,7 +1366,7 @@ wrapper_repr(TyObject *self) } static TyObject * -wrapper_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +wrapper_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { wrapperobject *wp = (wrapperobject *)self; return Ty_BuildValue("N(OO)", _TyEval_GetBuiltin(&_Ty_ID(getattr)), @@ -1379,12 +1379,12 @@ static TyMethodDef wrapper_methods[] = { }; static TyMemberDef wrapper_members[] = { - {"__self__", _Ty_T_OBJECT, offsetof(wrapperobject, self), Ty_READONLY}, + {"__self__", _Ty_T_OBJECT, offsetof(wrapperobject, self), Py_READONLY}, {0} }; static TyObject * -wrapper_objclass(TyObject *wp, void *Ty_UNUSED(ignored)) +wrapper_objclass(TyObject *wp, void *Py_UNUSED(ignored)) { TyObject *c = (TyObject *)PyDescr_TYPE(((wrapperobject *)wp)->descr); @@ -1392,7 +1392,7 @@ wrapper_objclass(TyObject *wp, void *Ty_UNUSED(ignored)) } static TyObject * -wrapper_name(TyObject *wp, void *Ty_UNUSED(ignored)) +wrapper_name(TyObject *wp, void *Py_UNUSED(ignored)) { const char *s = ((wrapperobject *)wp)->descr->d_base->name; @@ -1400,14 +1400,14 @@ wrapper_name(TyObject *wp, void *Ty_UNUSED(ignored)) } static TyObject * -wrapper_doc(TyObject *self, void *Ty_UNUSED(ignored)) +wrapper_doc(TyObject *self, void *Py_UNUSED(ignored)) { wrapperobject *wp = (wrapperobject *)self; return _TyType_GetDocFromInternalDoc(wp->descr->d_base->name, wp->descr->d_base->doc); } static TyObject * -wrapper_text_signature(TyObject *self, void *Ty_UNUSED(ignored)) +wrapper_text_signature(TyObject *self, void *Py_UNUSED(ignored)) { wrapperobject *wp = (wrapperobject *)self; return _TyType_GetTextSignatureFromInternalDoc(wp->descr->d_base->name, @@ -1415,7 +1415,7 @@ wrapper_text_signature(TyObject *self, void *Ty_UNUSED(ignored)) } static TyObject * -wrapper_qualname(TyObject *self, void *Ty_UNUSED(ignored)) +wrapper_qualname(TyObject *self, void *Py_UNUSED(ignored)) { wrapperobject *wp = (wrapperobject *)self; return descr_get_qualname((TyObject *)wp->descr, NULL); @@ -1558,9 +1558,9 @@ static TyObject * property_copy(TyObject *, TyObject *, TyObject *, TyObject *); static TyMemberDef property_members[] = { - {"fget", _Ty_T_OBJECT, offsetof(propertyobject, prop_get), Ty_READONLY}, - {"fset", _Ty_T_OBJECT, offsetof(propertyobject, prop_set), Ty_READONLY}, - {"fdel", _Ty_T_OBJECT, offsetof(propertyobject, prop_del), Ty_READONLY}, + {"fget", _Ty_T_OBJECT, offsetof(propertyobject, prop_get), Py_READONLY}, + {"fset", _Ty_T_OBJECT, offsetof(propertyobject, prop_set), Py_READONLY}, + {"fdel", _Ty_T_OBJECT, offsetof(propertyobject, prop_del), Py_READONLY}, {"__doc__", _Ty_T_OBJECT, offsetof(propertyobject, prop_doc), 0}, {0} }; @@ -1617,7 +1617,7 @@ property_set_name(TyObject *self, TyObject *args) { Ty_XSETREF(prop->prop_name, Ty_XNewRef(name)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef property_methods[] = { @@ -1912,7 +1912,7 @@ property_init_impl(propertyobject *self, TyObject *fget, TyObject *fset, } static TyObject * -property_get__name__(TyObject *op, void *Ty_UNUSED(ignored)) +property_get__name__(TyObject *op, void *Py_UNUSED(ignored)) { propertyobject *prop = _propertyobject_CAST(op); TyObject *name; @@ -1927,7 +1927,7 @@ property_get__name__(TyObject *op, void *Ty_UNUSED(ignored)) } static int -property_set__name__(TyObject *op, TyObject *value, void *Ty_UNUSED(ignored)) +property_set__name__(TyObject *op, TyObject *value, void *Py_UNUSED(ignored)) { propertyobject *prop = _propertyobject_CAST(op); Ty_XSETREF(prop->prop_name, Ty_XNewRef(value)); @@ -1943,7 +1943,7 @@ property_get___isabstractmethod__(TyObject *op, void *closure) return NULL; } else if (res) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } res = _TyObject_IsAbstract(prop->prop_set); @@ -1951,7 +1951,7 @@ property_get___isabstractmethod__(TyObject *op, void *closure) return NULL; } else if (res) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } res = _TyObject_IsAbstract(prop->prop_del); @@ -1959,9 +1959,9 @@ property_get___isabstractmethod__(TyObject *op, void *closure) return NULL; } else if (res) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyGetSetDef property_getsetlist[] = { diff --git a/Objects/dictobject.c b/Objects/dictobject.c index ccd1252..5db1691 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -156,7 +156,7 @@ ASSERT_DICT_LOCKED(TyObject *op) { _Ty_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(op); } -#define ASSERT_DICT_LOCKED(op) ASSERT_DICT_LOCKED(_Ty_CAST(TyObject*, op)) +#define ASSERT_DICT_LOCKED(op) ASSERT_DICT_LOCKED(_Py_CAST(TyObject*, op)) #define ASSERT_WORLD_STOPPED_OR_DICT_LOCKED(op) \ if (!_TyInterpreterState_GET()->stoptheworld.world_stopped) { \ ASSERT_DICT_LOCKED(op); \ @@ -1054,7 +1054,7 @@ compare_unicode_generic(PyDictObject *mp, PyDictKeysObject *dk, if (unicode_get_hash(ep->me_key) == hash) { TyObject *startkey = ep->me_key; Ty_INCREF(startkey); - int cmp = PyObject_RichCompareBool(startkey, key, Ty_EQ); + int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Ty_DECREF(startkey); if (cmp < 0) { return DKIX_ERROR; @@ -1110,7 +1110,7 @@ compare_generic(PyDictObject *mp, PyDictKeysObject *dk, if (ep->me_hash == hash) { TyObject *startkey = ep->me_key; Ty_INCREF(startkey); - int cmp = PyObject_RichCompareBool(startkey, key, Ty_EQ); + int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Ty_DECREF(startkey); if (cmp < 0) { return DKIX_ERROR; @@ -1385,7 +1385,7 @@ compare_unicode_generic_threadsafe(PyDictObject *mp, PyDictKeysObject *dk, } if (unicode_get_hash(startkey) == hash) { - int cmp = PyObject_RichCompareBool(startkey, key, Ty_EQ); + int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Ty_DECREF(startkey); if (cmp < 0) { return DKIX_ERROR; @@ -1463,7 +1463,7 @@ compare_generic_threadsafe(PyDictObject *mp, PyDictKeysObject *dk, if (startkey == NULL || !_Ty_TryIncrefCompare(&ep->me_key, startkey)) { return DKIX_KEY_CHANGED; } - int cmp = PyObject_RichCompareBool(startkey, key, Ty_EQ); + int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Ty_DECREF(startkey); if (cmp < 0) { return DKIX_ERROR; @@ -3691,7 +3691,7 @@ static TyObject * dict_update(TyObject *self, TyObject *args, TyObject *kwds) { if (dict_update_common(self, args, kwds, "update") != -1) - Ty_RETURN_NONE; + Py_RETURN_NONE; return NULL; } @@ -4167,7 +4167,7 @@ TyDict_Size(TyObject *mp) /* Return 1 if dicts equal, 0 if not, -1 if error. * Gets out as soon as any difference is detected. - * Uses only Ty_EQ comparison. + * Uses only Py_EQ comparison. */ static int dict_equal_lock_held(PyDictObject *a, PyDictObject *b) @@ -4220,7 +4220,7 @@ dict_equal_lock_held(PyDictObject *a, PyDictObject *b) return 0; } Ty_INCREF(bval); - cmp = PyObject_RichCompareBool(aval, bval, Ty_EQ); + cmp = PyObject_RichCompareBool(aval, bval, Py_EQ); Ty_DECREF(key); Ty_DECREF(aval); Ty_DECREF(bval); @@ -4251,11 +4251,11 @@ dict_richcompare(TyObject *v, TyObject *w, int op) if (!TyDict_Check(v) || !TyDict_Check(w)) { res = Ty_NotImplemented; } - else if (op == Ty_EQ || op == Ty_NE) { + else if (op == Py_EQ || op == Py_NE) { cmp = dict_equal((PyDictObject *)v, (PyDictObject *)w); if (cmp < 0) return NULL; - res = (cmp == (op == Ty_EQ)) ? Ty_True : Ty_False; + res = (cmp == (op == Py_EQ)) ? Ty_True : Ty_False; } else res = Ty_NotImplemented; @@ -4282,9 +4282,9 @@ dict___contains___impl(PyDictObject *self, TyObject *key) return NULL; } if (contains) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /*[clinic input] @@ -4493,7 +4493,7 @@ dict_clear_impl(PyDictObject *self) /*[clinic end generated code: output=5139a830df00830a input=0bf729baba97a4c2]*/ { TyDict_Clear((TyObject *)self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -4709,7 +4709,7 @@ static TyObject * dict_or(TyObject *self, TyObject *other) { if (!TyDict_Check(self) || !TyDict_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } TyObject *new = TyDict_Copy(self); if (new == NULL) { @@ -5123,7 +5123,7 @@ dictiter_traverse(TyObject *self, visitproc visit, void *arg) } static TyObject * -dictiter_len(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dictiter_len(TyObject *self, TyObject *Py_UNUSED(ignored)) { dictiterobject *di = (dictiterobject *)self; Ty_ssize_t len = 0; @@ -5136,7 +5136,7 @@ PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -dictiter_reduce(TyObject *di, TyObject *Ty_UNUSED(ignored)); +dictiter_reduce(TyObject *di, TyObject *Py_UNUSED(ignored)); PyDoc_STRVAR(reduce_doc, "Return state information for pickling."); @@ -5854,7 +5854,7 @@ dict___reversed___impl(PyDictObject *self) } static TyObject * -dictiter_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dictiter_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { dictiterobject *di = (dictiterobject *)self; /* copy the iterator state */ @@ -5950,7 +5950,7 @@ _PyDictView_New(TyObject *dict, TyTypeObject *type) } static TyObject * -dictview_mapping(TyObject *view, void *Ty_UNUSED(ignored)) { +dictview_mapping(TyObject *view, void *Py_UNUSED(ignored)) { assert(view != NULL); assert(PyDictKeys_Check(view) || PyDictValues_Check(view) @@ -6011,7 +6011,7 @@ dictview_richcompare(TyObject *self, TyObject *other, int op) assert(other != NULL); if (!PyAnySet_Check(other) && !PyDictViewSet_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; len_self = PyObject_Size(self); if (len_self < 0) @@ -6023,30 +6023,30 @@ dictview_richcompare(TyObject *self, TyObject *other, int op) ok = 0; switch(op) { - case Ty_NE: - case Ty_EQ: + case Py_NE: + case Py_EQ: if (len_self == len_other) ok = all_contained_in(self, other); - if (op == Ty_NE && ok >= 0) + if (op == Py_NE && ok >= 0) ok = !ok; break; - case Ty_LT: + case Py_LT: if (len_self < len_other) ok = all_contained_in(self, other); break; - case Ty_LE: + case Py_LE: if (len_self <= len_other) ok = all_contained_in(self, other); break; - case Ty_GT: + case Py_GT: if (len_self > len_other) ok = all_contained_in(other, self); break; - case Ty_GE: + case Py_GE: if (len_self >= len_other) ok = all_contained_in(other, self); break; @@ -6089,7 +6089,7 @@ dictkeys_iter(TyObject *self) { _PyDictViewObject *dv = (_PyDictViewObject *)self; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return dictiter_new(dv->dv_dict, &PyDictIterKey_Type); } @@ -6287,7 +6287,7 @@ dictitems_xor_lock_held(TyObject *d1, TyObject *d2) } else { Ty_INCREF(val1); - to_delete = PyObject_RichCompareBool(val1, val2, Ty_EQ); + to_delete = PyObject_RichCompareBool(val1, val2, Py_EQ); if (to_delete < 0) { goto error; } @@ -6402,9 +6402,9 @@ dictviews_isdisjoint(TyObject *self, TyObject *other) if (self == other) { if (dictview_len(self) == 0) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; else - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /* Iterate over the shorter object (only if other is a set, @@ -6436,19 +6436,19 @@ dictviews_isdisjoint(TyObject *self, TyObject *other) if (contains) { Ty_DECREF(it); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } Ty_DECREF(it); if (TyErr_Occurred()) return NULL; /* TyIter_Next raised an exception. */ - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } PyDoc_STRVAR(isdisjoint_doc, "Return True if the view and the given iterable have a null intersection."); -static TyObject* dictkeys_reversed(TyObject *dv, TyObject *Ty_UNUSED(ignored)); +static TyObject* dictkeys_reversed(TyObject *dv, TyObject *Py_UNUSED(ignored)); PyDoc_STRVAR(reversed_keys_doc, "Return a reverse iterator over the dict keys."); @@ -6508,11 +6508,11 @@ dict_keys_impl(PyDictObject *self) } static TyObject * -dictkeys_reversed(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dictkeys_reversed(TyObject *self, TyObject *Py_UNUSED(ignored)) { _PyDictViewObject *dv = (_PyDictViewObject *)self; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return dictiter_new(dv->dv_dict, &PyDictRevIterKey_Type); } @@ -6524,7 +6524,7 @@ dictitems_iter(TyObject *self) { _PyDictViewObject *dv = (_PyDictViewObject *)self; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return dictiter_new(dv->dv_dict, &PyDictIterItem_Type); } @@ -6543,7 +6543,7 @@ dictitems_contains(TyObject *self, TyObject *obj) value = TyTuple_GET_ITEM(obj, 1); result = TyDict_GetItemRef((TyObject *)dv->dv_dict, key, &found); if (result == 1) { - result = PyObject_RichCompareBool(found, value, Ty_EQ); + result = PyObject_RichCompareBool(found, value, Py_EQ); Ty_DECREF(found); } return result; @@ -6560,7 +6560,7 @@ static PySequenceMethods dictitems_as_sequence = { dictitems_contains, /* sq_contains */ }; -static TyObject* dictitems_reversed(TyObject *dv, TyObject *Ty_UNUSED(ignored)); +static TyObject* dictitems_reversed(TyObject *dv, TyObject *Py_UNUSED(ignored)); PyDoc_STRVAR(reversed_items_doc, "Return a reverse iterator over the dict items."); @@ -6620,11 +6620,11 @@ dict_items_impl(PyDictObject *self) } static TyObject * -dictitems_reversed(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dictitems_reversed(TyObject *self, TyObject *Py_UNUSED(ignored)) { _PyDictViewObject *dv = (_PyDictViewObject *)self; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return dictiter_new(dv->dv_dict, &PyDictRevIterItem_Type); } @@ -6636,7 +6636,7 @@ dictvalues_iter(TyObject *self) { _PyDictViewObject *dv = (_PyDictViewObject *)self; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return dictiter_new(dv->dv_dict, &PyDictIterValue_Type); } @@ -6652,7 +6652,7 @@ static PySequenceMethods dictvalues_as_sequence = { 0, /* sq_contains */ }; -static TyObject* dictvalues_reversed(TyObject *dv, TyObject *Ty_UNUSED(ignored)); +static TyObject* dictvalues_reversed(TyObject *dv, TyObject *Py_UNUSED(ignored)); PyDoc_STRVAR(reversed_values_doc, "Return a reverse iterator over the dict values."); @@ -6710,11 +6710,11 @@ dict_values_impl(PyDictObject *self) } static TyObject * -dictvalues_reversed(TyObject *self, TyObject *Ty_UNUSED(ignored)) +dictvalues_reversed(TyObject *self, TyObject *Py_UNUSED(ignored)) { _PyDictViewObject *dv = (_PyDictViewObject *)self; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return dictiter_new(dv->dv_dict, &PyDictRevIterValue_Type); } diff --git a/Objects/enumobject.c b/Objects/enumobject.c index 41cc2ce..c7bb41f 100644 --- a/Objects/enumobject.c +++ b/Objects/enumobject.c @@ -286,7 +286,7 @@ enum_next(TyObject *op) } static TyObject * -enum_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +enum_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { enumobject *en = _enumobject_CAST(op); TyObject *result; @@ -475,7 +475,7 @@ reversed_next(TyObject *op) } static TyObject * -reversed_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) +reversed_len(TyObject *op, TyObject *Py_UNUSED(ignored)) { reversedobject *ro = _reversedobject_CAST(op); Ty_ssize_t position, seqsize; @@ -494,7 +494,7 @@ reversed_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -reversed_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +reversed_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { reversedobject *ro = _reversedobject_CAST(op); Ty_ssize_t index = FT_ATOMIC_LOAD_SSIZE_RELAXED(ro->index); @@ -527,7 +527,7 @@ reversed_setstate(TyObject *op, TyObject *state) index = n-1; FT_ATOMIC_STORE_SSIZE_RELAXED(ro->index, index); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(setstate_doc, "Set state information for unpickling."); diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 141abab..c3a7943 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -8,7 +8,7 @@ #include #include "pycore_abstract.h" // _TyObject_RealIsSubclass() #include "pycore_ceval.h" // _Ty_EnterRecursiveCall -#include "pycore_exceptions.h" // struct _Ty_exc_state +#include "pycore_exceptions.h" // struct _Py_exc_state #include "pycore_initconfig.h" #include "pycore_modsupport.h" // _TyArg_NoKeywords() #include "pycore_object.h" @@ -34,7 +34,7 @@ TyObject *TyExc_WindowsError = NULL; // borrowed ref #endif -static struct _Ty_exc_state* +static struct _Py_exc_state* get_exc_state(void) { PyInterpreterState *interp = _TyInterpreterState_GET(); @@ -262,7 +262,7 @@ BaseException___setstate___impl(PyBaseExceptionObject *self, TyObject *state) } } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -322,7 +322,7 @@ BaseException_add_note_impl(PyBaseExceptionObject *self, TyObject *note) return NULL; } Ty_DECREF(notes); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef BaseException_methods[] = { @@ -344,7 +344,7 @@ BaseException_args_get_impl(PyBaseExceptionObject *self) /*[clinic end generated code: output=e02e34e35cf4d677 input=64282386e4d7822d]*/ { if (self->args == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->args); } @@ -382,7 +382,7 @@ BaseException___traceback___get_impl(PyBaseExceptionObject *self) /*[clinic end generated code: output=17cf874a52339398 input=a2277f0de62170cf]*/ { if (self->traceback == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->traceback); } @@ -428,7 +428,7 @@ BaseException___context___get_impl(PyBaseExceptionObject *self) /*[clinic end generated code: output=6ec5d296ce8d1c93 input=b2d22687937e66ab]*/ { if (self->context == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->context); } @@ -471,7 +471,7 @@ BaseException___cause___get_impl(PyBaseExceptionObject *self) /*[clinic end generated code: output=987f6c4d8a0bdbab input=40e0eac427b6e602]*/ { if (self->cause == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->cause); } @@ -885,7 +885,7 @@ PyBaseExceptionGroupObject_CAST(TyObject *exc) static TyObject * BaseExceptionGroup_new(TyTypeObject *type, TyObject *args, TyObject *kwds) { - struct _Ty_exc_state *state = get_exc_state(); + struct _Py_exc_state *state = get_exc_state(); TyTypeObject *TyExc_ExceptionGroup = (TyTypeObject*)state->TyExc_ExceptionGroup; @@ -1679,9 +1679,9 @@ PyUnstable_Exc_PrepReraiseStar(TyObject *orig, TyObject *excs) } static TyMemberDef BaseExceptionGroup_members[] = { - {"message", _Ty_T_OBJECT, offsetof(PyBaseExceptionGroupObject, msg), Ty_READONLY, + {"message", _Ty_T_OBJECT, offsetof(PyBaseExceptionGroupObject, msg), Py_READONLY, PyDoc_STR("exception message")}, - {"exceptions", _Ty_T_OBJECT, offsetof(PyBaseExceptionGroupObject, excs), Ty_READONLY, + {"exceptions", _Ty_T_OBJECT, offsetof(PyBaseExceptionGroupObject, excs), Py_READONLY, PyDoc_STR("nested exceptions")}, {NULL} /* Sentinel */ }; @@ -1706,7 +1706,7 @@ ComplexExtendsException(TyExc_BaseException, BaseExceptionGroup, */ static TyObject* create_exception_group_class(void) { - struct _Ty_exc_state *state = get_exc_state(); + struct _Py_exc_state *state = get_exc_state(); TyObject *bases = TyTuple_Pack( 2, TyExc_BaseExceptionGroup, TyExc_Exception); @@ -1843,13 +1843,13 @@ ImportError_getstate(TyObject *op) return Ty_NewRef(dict); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } /* Pickling support */ static TyObject * -ImportError_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +ImportError_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *res; TyObject *state = ImportError_getstate(self); @@ -2088,7 +2088,7 @@ OSError_new(TyTypeObject *type, TyObject *args, TyObject *kwds) )) goto error; - struct _Ty_exc_state *state = get_exc_state(); + struct _Py_exc_state *state = get_exc_state(); if (myerrno && TyLong_Check(myerrno) && state->errnomap && (TyObject *) type == TyExc_OSError) { TyObject *newtype; @@ -2254,7 +2254,7 @@ OSError_str(TyObject *op) } static TyObject * -OSError_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +OSError_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyOSErrorObject *self = PyOSErrorObject_CAST(op); TyObject *args = self->args; @@ -2574,7 +2574,7 @@ AttributeError_traverse(TyObject *op, visitproc visit, void *arg) /* Pickling support */ static TyObject * -AttributeError_getstate(TyObject *op, TyObject *Ty_UNUSED(ignored)) +AttributeError_getstate(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyAttributeErrorObject *self = PyAttributeErrorObject_CAST(op); TyObject *dict = self->dict; @@ -2599,11 +2599,11 @@ AttributeError_getstate(TyObject *op, TyObject *Ty_UNUSED(ignored)) else if (dict) { return Ty_NewRef(dict); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -AttributeError_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +AttributeError_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { TyObject *state = AttributeError_getstate(op, NULL); if (state == NULL) { @@ -3967,7 +3967,7 @@ static TyObject * get_memory_error(int allow_allocation, TyObject *args, TyObject *kwds) { PyBaseExceptionObject *self = NULL; - struct _Ty_exc_state *state = get_exc_state(); + struct _Py_exc_state *state = get_exc_state(); MEMERRORS_LOCK(state); if (state->memerrors_freelist != NULL) { @@ -4036,7 +4036,7 @@ MemoryError_dealloc(TyObject *op) return; } - struct _Ty_exc_state *state = get_exc_state(); + struct _Py_exc_state *state = get_exc_state(); MEMERRORS_LOCK(state); if (state->memerrors_numfree < MEMERRORS_SAVE) { self->dict = (TyObject *) state->memerrors_freelist; @@ -4072,7 +4072,7 @@ preallocate_memerrors(void) } static void -free_preallocated_memerrors(struct _Ty_exc_state *state) +free_preallocated_memerrors(struct _Py_exc_state *state) { while (state->memerrors_freelist != NULL) { TyObject *self = (TyObject *) state->memerrors_freelist; @@ -4385,7 +4385,7 @@ _PyExc_InitGlobalObjects(PyInterpreterState *interp) PyStatus _PyExc_InitState(PyInterpreterState *interp) { - struct _Ty_exc_state *state = &interp->exc_state; + struct _Py_exc_state *state = &interp->exc_state; #define ADD_ERRNO(TYPE, CODE) \ do { \ @@ -4488,14 +4488,14 @@ _PyBuiltins_AddExceptions(TyObject *bltinmod) void _PyExc_ClearExceptionGroupType(PyInterpreterState *interp) { - struct _Ty_exc_state *state = &interp->exc_state; + struct _Py_exc_state *state = &interp->exc_state; Ty_CLEAR(state->TyExc_ExceptionGroup); } void _PyExc_Fini(PyInterpreterState *interp) { - struct _Ty_exc_state *state = &interp->exc_state; + struct _Py_exc_state *state = &interp->exc_state; free_preallocated_memerrors(state); Ty_CLEAR(state->errnomap); diff --git a/Objects/fileobject.c b/Objects/fileobject.c index a624ea8..176790e 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -322,7 +322,7 @@ stdprinter_write(TyObject *op, TyObject *args) * I can't raise an exception here. It may lead to an * unlimited recursion in the case stderr is invalid. */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (!TyArg_ParseTuple(args, "U", &unicode)) { @@ -349,7 +349,7 @@ stdprinter_write(TyObject *op, TyObject *args) if (n == -1) { if (err == EAGAIN) { TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return NULL; } @@ -358,7 +358,7 @@ stdprinter_write(TyObject *op, TyObject *args) } static TyObject * -stdprinter_fileno(TyObject *op, TyObject *Ty_UNUSED(ignored)) +stdprinter_fileno(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyStdPrinter_Object *self = (PyStdPrinter_Object*)op; return TyLong_FromLong((long) self->fd); @@ -373,18 +373,18 @@ stdprinter_repr(TyObject *op) } static TyObject * -stdprinter_noop(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stdprinter_noop(TyObject *self, TyObject *Py_UNUSED(ignored)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -stdprinter_isatty(TyObject *op, TyObject *Ty_UNUSED(ignored)) +stdprinter_isatty(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyStdPrinter_Object *self = (PyStdPrinter_Object*)op; long res; if (self->fd < 0) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } Ty_BEGIN_ALLOW_THREADS @@ -404,21 +404,21 @@ static TyMethodDef stdprinter_methods[] = { }; static TyObject * -get_closed(TyObject *self, void *Ty_UNUSED(closure)) +get_closed(TyObject *self, void *Py_UNUSED(closure)) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * -get_mode(TyObject *self, void *Ty_UNUSED(closure)) +get_mode(TyObject *self, void *Py_UNUSED(closure)) { return TyUnicode_FromString("w"); } static TyObject * -get_encoding(TyObject *self, void *Ty_UNUSED(closure)) +get_encoding(TyObject *self, void *Py_UNUSED(closure)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyGetSetDef stdprinter_getsetlist[] = { diff --git a/Objects/floatobject.c b/Objects/floatobject.c index c39c1d0..85d6221 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -527,29 +527,29 @@ float_richcompare(TyObject *v, TyObject *w, int op) Compare: switch (op) { - case Ty_EQ: + case Py_EQ: r = i == j; break; - case Ty_NE: + case Py_NE: r = i != j; break; - case Ty_LE: + case Py_LE: r = i <= j; break; - case Ty_GE: + case Py_GE: r = i >= j; break; - case Ty_LT: + case Py_LT: r = i < j; break; - case Ty_GT: + case Py_GT: r = i > j; break; } return TyBool_FromLong(r); Unimplemented: - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } static Ty_hash_t @@ -862,7 +862,7 @@ float_is_integer_impl(TyObject *self) if (x == -1.0 && TyErr_Occurred()) return NULL; if (!isfinite(x)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; errno = 0; o = (floor(x) == x) ? Ty_True : Ty_False; if (errno != 0) { @@ -1749,13 +1749,13 @@ float___getformat___impl(TyTypeObject *type, const char *typestr) static TyObject * -float_getreal(TyObject *v, void *Ty_UNUSED(closure)) +float_getreal(TyObject *v, void *Py_UNUSED(closure)) { return float_float(v); } static TyObject * -float_getimag(TyObject *Ty_UNUSED(v), void *Ty_UNUSED(closure)) +float_getimag(TyObject *Py_UNUSED(v), void *Py_UNUSED(closure)) { return TyFloat_FromDouble(0.0); } diff --git a/Objects/frameobject.c b/Objects/frameobject.c index f04a019..9c88fc3 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -156,7 +156,7 @@ framelocalsproxy_getkeyindex(PyFrameObject *frame, TyObject *key, bool read, TyO if (name_hash != key_hash) { continue; } - int same = PyObject_RichCompareBool(name, key, Ty_EQ); + int same = PyObject_RichCompareBool(name, key, Py_EQ); if (same < 0) { return -2; } @@ -367,7 +367,7 @@ framelocalsproxy_merge(TyObject* self, TyObject* other) } static TyObject * -framelocalsproxy_keys(TyObject *self, TyObject *Ty_UNUSED(ignored)) +framelocalsproxy_keys(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyFrameObject *frame = PyFrameLocalsProxyObject_CAST(self)->frame; PyCodeObject *co = _TyFrame_GetCode(frame->f_frame); @@ -484,9 +484,9 @@ framelocalsproxy_richcompare(TyObject *lhs, TyObject *rhs, int op) if (PyFrameLocalsProxy_Check(rhs)) { PyFrameLocalsProxyObject *other = (PyFrameLocalsProxyObject *)rhs; bool result = self->frame == other->frame; - if (op == Ty_EQ) { + if (op == Py_EQ) { return TyBool_FromLong(result); - } else if (op == Ty_NE) { + } else if (op == Py_NE) { return TyBool_FromLong(!result); } } else if (TyDict_Check(rhs)) { @@ -505,7 +505,7 @@ framelocalsproxy_richcompare(TyObject *lhs, TyObject *rhs, int op) return result; } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } static TyObject * @@ -540,7 +540,7 @@ static TyObject* framelocalsproxy_or(TyObject *self, TyObject *other) { if (!TyDict_Check(other) && !PyFrameLocalsProxy_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } TyObject *result = TyDict_New(); @@ -565,18 +565,18 @@ static TyObject* framelocalsproxy_inplace_or(TyObject *self, TyObject *other) { if (!TyDict_Check(other) && !PyFrameLocalsProxy_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } if (framelocalsproxy_merge(self, other) < 0) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } return Ty_NewRef(self); } static TyObject * -framelocalsproxy_values(TyObject *self, TyObject *Ty_UNUSED(ignored)) +framelocalsproxy_values(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyFrameObject *frame = PyFrameLocalsProxyObject_CAST(self)->frame; PyCodeObject *co = _TyFrame_GetCode(frame->f_frame); @@ -614,7 +614,7 @@ framelocalsproxy_values(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -framelocalsproxy_items(TyObject *self, TyObject *Ty_UNUSED(ignored)) +framelocalsproxy_items(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyFrameObject *frame = PyFrameLocalsProxyObject_CAST(self)->frame; PyCodeObject *co = _TyFrame_GetCode(frame->f_frame); @@ -730,7 +730,7 @@ framelocalsproxy_update(TyObject *self, TyObject *other) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject* @@ -846,7 +846,7 @@ framelocalsproxy_pop(TyObject* self, TyObject *const *args, Ty_ssize_t nargs) } static TyObject* -framelocalsproxy_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +framelocalsproxy_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject* result = TyDict_New(); @@ -863,7 +863,7 @@ framelocalsproxy_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject* -framelocalsproxy_reversed(TyObject *self, TyObject *Ty_UNUSED(ignored)) +framelocalsproxy_reversed(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *result = framelocalsproxy_keys(self, NULL); @@ -1019,7 +1019,7 @@ frame_lineno_get_impl(PyFrameObject *self) { int lineno = TyFrame_GetLineNumber(self); if (lineno < 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyLong_FromLong(lineno); } @@ -1110,7 +1110,7 @@ frame_back_get_impl(PyFrameObject *self) { TyObject *res = (TyObject *)TyFrame_GetBack(self); if (res == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return res; } @@ -1889,7 +1889,7 @@ frame_generator_get_impl(PyFrameObject *self) TyObject *gen = (TyObject *)_TyGen_GetGeneratorFromFrame(self->f_frame); return Ty_NewRef(gen); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2009,7 +2009,7 @@ frame_clear_impl(PyFrameObject *self) assert(self->f_frame->owner == FRAME_OWNED_BY_FRAME_OBJECT); (void)frame_tp_clear((TyObject *)self); } - Ty_RETURN_NONE; + Py_RETURN_NONE; running: TyErr_SetString(TyExc_RuntimeError, "cannot clear an executing frame"); diff --git a/Objects/funcobject.c b/Objects/funcobject.c index a6d5e7b..752b731 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -552,7 +552,7 @@ func_get_annotation_dict(PyFunctionObject *op) { if (op->func_annotations == NULL) { if (op->func_annotate == NULL || !PyCallable_Check(op->func_annotate)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *one = _TyLong_GetOne(); TyObject *ann_dict = _TyObject_CallOneArg(op->func_annotate, one); @@ -631,11 +631,11 @@ TyFunction_SetAnnotations(TyObject *op, TyObject *annotations) #define OFF(x) offsetof(PyFunctionObject, x) static TyMemberDef func_memberlist[] = { - {"__closure__", _Ty_T_OBJECT, OFF(func_closure), Ty_READONLY}, + {"__closure__", _Ty_T_OBJECT, OFF(func_closure), Py_READONLY}, {"__doc__", _Ty_T_OBJECT, OFF(func_doc), 0}, - {"__globals__", _Ty_T_OBJECT, OFF(func_globals), Ty_READONLY}, + {"__globals__", _Ty_T_OBJECT, OFF(func_globals), Py_READONLY}, {"__module__", _Ty_T_OBJECT, OFF(func_module), 0}, - {"__builtins__", _Ty_T_OBJECT, OFF(func_builtins), Ty_READONLY}, + {"__builtins__", _Ty_T_OBJECT, OFF(func_builtins), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -647,7 +647,7 @@ class function "PyFunctionObject *" "&TyFunction_Type" #include "clinic/funcobject.c.h" static TyObject * -func_get_code(TyObject *self, void *Ty_UNUSED(ignored)) +func_get_code(TyObject *self, void *Py_UNUSED(ignored)) { PyFunctionObject *op = _PyFunction_CAST(self); if (TySys_Audit("object.__getattr__", "Os", op, "__code__") < 0) { @@ -658,7 +658,7 @@ func_get_code(TyObject *self, void *Ty_UNUSED(ignored)) } static int -func_set_code(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) +func_set_code(TyObject *self, TyObject *value, void *Py_UNUSED(ignored)) { PyFunctionObject *op = _PyFunction_CAST(self); @@ -707,14 +707,14 @@ func_set_code(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) } static TyObject * -func_get_name(TyObject *self, void *Ty_UNUSED(ignored)) +func_get_name(TyObject *self, void *Py_UNUSED(ignored)) { PyFunctionObject *op = _PyFunction_CAST(self); return Ty_NewRef(op->func_name); } static int -func_set_name(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) +func_set_name(TyObject *self, TyObject *value, void *Py_UNUSED(ignored)) { PyFunctionObject *op = _PyFunction_CAST(self); /* Not legal to del f.func_name or to set it to anything @@ -729,14 +729,14 @@ func_set_name(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) } static TyObject * -func_get_qualname(TyObject *self, void *Ty_UNUSED(ignored)) +func_get_qualname(TyObject *self, void *Py_UNUSED(ignored)) { PyFunctionObject *op = _PyFunction_CAST(self); return Ty_NewRef(op->func_qualname); } static int -func_set_qualname(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) +func_set_qualname(TyObject *self, TyObject *value, void *Py_UNUSED(ignored)) { PyFunctionObject *op = _PyFunction_CAST(self); /* Not legal to del f.__qualname__ or to set it to anything @@ -751,20 +751,20 @@ func_set_qualname(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) } static TyObject * -func_get_defaults(TyObject *self, void *Ty_UNUSED(ignored)) +func_get_defaults(TyObject *self, void *Py_UNUSED(ignored)) { PyFunctionObject *op = _PyFunction_CAST(self); if (TySys_Audit("object.__getattr__", "Os", op, "__defaults__") < 0) { return NULL; } if (op->func_defaults == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(op->func_defaults); } static int -func_set_defaults(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) +func_set_defaults(TyObject *self, TyObject *value, void *Py_UNUSED(ignored)) { /* Legal to del f.func_defaults. * Can only set func_defaults to NULL or a tuple. */ @@ -793,7 +793,7 @@ func_set_defaults(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) } static TyObject * -func_get_kwdefaults(TyObject *self, void *Ty_UNUSED(ignored)) +func_get_kwdefaults(TyObject *self, void *Py_UNUSED(ignored)) { PyFunctionObject *op = _PyFunction_CAST(self); if (TySys_Audit("object.__getattr__", "Os", @@ -801,13 +801,13 @@ func_get_kwdefaults(TyObject *self, void *Ty_UNUSED(ignored)) return NULL; } if (op->func_kwdefaults == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(op->func_kwdefaults); } static int -func_set_kwdefaults(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) +func_set_kwdefaults(TyObject *self, TyObject *value, void *Py_UNUSED(ignored)) { PyFunctionObject *op = _PyFunction_CAST(self); if (value == Ty_None) @@ -848,7 +848,7 @@ function___annotate___get_impl(PyFunctionObject *self) /*[clinic end generated code: output=5ec7219ff2bda9e6 input=7f3db11e3c3329f3]*/ { if (self->func_annotate == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(self->func_annotate); } @@ -974,7 +974,7 @@ function___type_params___set_impl(PyFunctionObject *self, TyObject *value) } TyObject * -_Ty_set_function_type_params(PyThreadState *Ty_UNUSED(ignored), TyObject *func, +_Ty_set_function_type_params(PyThreadState *Py_UNUSED(ignored), TyObject *func, TyObject *type_params) { assert(TyFunction_Check(func)); @@ -1424,7 +1424,7 @@ typedef struct { #define _PyClassMethod_CAST(cm) \ (assert(PyObject_TypeCheck((cm), &TyClassMethod_Type)), \ - _Ty_CAST(classmethod*, cm)) + _Py_CAST(classmethod*, cm)) static void cm_dealloc(TyObject *self) @@ -1489,8 +1489,8 @@ cm_init(TyObject *self, TyObject *args, TyObject *kwds) } static TyMemberDef cm_memberlist[] = { - {"__func__", _Ty_T_OBJECT, offsetof(classmethod, cm_callable), Ty_READONLY}, - {"__wrapped__", _Ty_T_OBJECT, offsetof(classmethod, cm_callable), Ty_READONLY}, + {"__func__", _Ty_T_OBJECT, offsetof(classmethod, cm_callable), Py_READONLY}, + {"__wrapped__", _Ty_T_OBJECT, offsetof(classmethod, cm_callable), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -1503,9 +1503,9 @@ cm_get___isabstractmethod__(TyObject *self, void *closure) return NULL; } else if (res) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * @@ -1658,7 +1658,7 @@ typedef struct { #define _PyStaticMethod_CAST(cm) \ (assert(PyObject_TypeCheck((cm), &TyStaticMethod_Type)), \ - _Ty_CAST(staticmethod*, cm)) + _Py_CAST(staticmethod*, cm)) static void sm_dealloc(TyObject *self) @@ -1727,8 +1727,8 @@ sm_call(TyObject *callable, TyObject *args, TyObject *kwargs) } static TyMemberDef sm_memberlist[] = { - {"__func__", _Ty_T_OBJECT, offsetof(staticmethod, sm_callable), Ty_READONLY}, - {"__wrapped__", _Ty_T_OBJECT, offsetof(staticmethod, sm_callable), Ty_READONLY}, + {"__func__", _Ty_T_OBJECT, offsetof(staticmethod, sm_callable), Py_READONLY}, + {"__wrapped__", _Ty_T_OBJECT, offsetof(staticmethod, sm_callable), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -1741,9 +1741,9 @@ sm_get___isabstractmethod__(TyObject *self, void *closure) return NULL; } else if (res) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c index 4aafd19..bccd790 100644 --- a/Objects/genericaliasobject.c +++ b/Objects/genericaliasobject.c @@ -671,37 +671,37 @@ static TyObject * ga_richcompare(TyObject *a, TyObject *b, int op) { if (!_PyGenericAlias_Check(b) || - (op != Ty_EQ && op != Ty_NE)) + (op != Py_EQ && op != Py_NE)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } - if (op == Ty_NE) { - TyObject *eq = ga_richcompare(a, b, Ty_EQ); + if (op == Py_NE) { + TyObject *eq = ga_richcompare(a, b, Py_EQ); if (eq == NULL) return NULL; Ty_DECREF(eq); if (eq == Ty_True) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } else { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } } gaobject *aa = (gaobject *)a; gaobject *bb = (gaobject *)b; if (aa->starred != bb->starred) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - int eq = PyObject_RichCompareBool(aa->origin, bb->origin, Ty_EQ); + int eq = PyObject_RichCompareBool(aa->origin, bb->origin, Py_EQ); if (eq < 0) { return NULL; } if (!eq) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - return PyObject_RichCompare(aa->args, bb->args, Ty_EQ); + return PyObject_RichCompare(aa->args, bb->args, Py_EQ); } static TyObject * @@ -712,7 +712,7 @@ ga_mro_entries(TyObject *self, TyObject *args) } static TyObject * -ga_instancecheck(TyObject *self, TyObject *Ty_UNUSED(ignored)) +ga_instancecheck(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyErr_SetString(TyExc_TypeError, "isinstance() argument 2 cannot be a parameterized generic"); @@ -720,7 +720,7 @@ ga_instancecheck(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -ga_subclasscheck(TyObject *self, TyObject *Ty_UNUSED(ignored)) +ga_subclasscheck(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyErr_SetString(TyExc_TypeError, "issubclass() argument 2 cannot be a parameterized generic"); @@ -728,7 +728,7 @@ ga_subclasscheck(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -ga_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +ga_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { gaobject *alias = (gaobject *)self; if (alias->starred) { @@ -746,7 +746,7 @@ ga_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -ga_dir(TyObject *self, TyObject *Ty_UNUSED(ignored)) +ga_dir(TyObject *self, TyObject *Py_UNUSED(ignored)) { gaobject *alias = (gaobject *)self; TyObject *dir = PyObject_Dir(alias->origin); @@ -793,9 +793,9 @@ static TyMethodDef ga_methods[] = { }; static TyMemberDef ga_members[] = { - {"__origin__", _Ty_T_OBJECT, offsetof(gaobject, origin), Ty_READONLY}, - {"__args__", _Ty_T_OBJECT, offsetof(gaobject, args), Ty_READONLY}, - {"__unpacked__", Ty_T_BOOL, offsetof(gaobject, starred), Ty_READONLY}, + {"__origin__", _Ty_T_OBJECT, offsetof(gaobject, origin), Py_READONLY}, + {"__args__", _Ty_T_OBJECT, offsetof(gaobject, args), Py_READONLY}, + {"__unpacked__", Ty_T_BOOL, offsetof(gaobject, starred), Py_READONLY}, {0} }; @@ -819,7 +819,7 @@ ga_unpacked_tuple_args(TyObject *self, void *unused) if (alias->starred && alias->origin == (TyObject *)&TyTuple_Type) { return Ty_NewRef(alias->args); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyGetSetDef ga_properties[] = { @@ -928,7 +928,7 @@ ga_iter_clear(TyObject *self) } static TyObject * -ga_iter_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +ga_iter_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *iter = _TyEval_GetBuiltin(&_Ty_ID(iter)); gaiterobject *gi = (gaiterobject *)self; diff --git a/Objects/genobject.c b/Objects/genobject.c index 29a5d9c..c7d6a1b 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -29,12 +29,12 @@ static TyObject* async_gen_athrow_new(PyAsyncGenObject *, TyObject *); #define _TyGen_CAST(op) \ - _Ty_CAST(PyGenObject*, (op)) + _Py_CAST(PyGenObject*, (op)) #define _PyCoroObject_CAST(op) \ (assert(TyCoro_CheckExact(op)), \ - _Ty_CAST(PyCoroObject*, (op))) + _Py_CAST(PyCoroObject*, (op))) #define _PyAsyncGenObject_CAST(op) \ - _Ty_CAST(PyAsyncGenObject*, (op)) + _Py_CAST(PyAsyncGenObject*, (op)) static const char *NON_INIT_CORO_MSG = "can't send non-None value to a " @@ -390,10 +390,10 @@ gen_close(TyObject *self, TyObject *args) if (gen->gi_frame_state == FRAME_CREATED) { gen->gi_frame_state = FRAME_COMPLETED; - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (FRAME_STATE_FINISHED(gen->gi_frame_state)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *yf = _TyGen_yf(gen); @@ -416,7 +416,7 @@ gen_close(TyObject *self, TyObject *args) assert((oparg & RESUME_OPARG_LOCATION_MASK) != RESUME_AT_FUNC_START); gen->gi_frame_state = FRAME_COMPLETED; gen_clear_frame(gen); - Ty_RETURN_NONE; + Py_RETURN_NONE; } } if (err == 0) { @@ -439,7 +439,7 @@ gen_close(TyObject *self, TyObject *args) if (TyErr_ExceptionMatches(TyExc_GeneratorExit)) { TyErr_Clear(); /* ignore this error */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* if the generator returned a value while closing, StopIteration was @@ -701,14 +701,14 @@ gen_repr(TyObject *self) } static TyObject * -gen_get_name(TyObject *self, void *Ty_UNUSED(ignored)) +gen_get_name(TyObject *self, void *Py_UNUSED(ignored)) { PyGenObject *op = _TyGen_CAST(self); return Ty_NewRef(op->gi_name); } static int -gen_set_name(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) +gen_set_name(TyObject *self, TyObject *value, void *Py_UNUSED(ignored)) { PyGenObject *op = _TyGen_CAST(self); /* Not legal to del gen.gi_name or to set it to anything @@ -723,14 +723,14 @@ gen_set_name(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) } static TyObject * -gen_get_qualname(TyObject *self, void *Ty_UNUSED(ignored)) +gen_get_qualname(TyObject *self, void *Py_UNUSED(ignored)) { PyGenObject *op = _TyGen_CAST(self); return Ty_NewRef(op->gi_qualname); } static int -gen_set_qualname(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) +gen_set_qualname(TyObject *self, TyObject *value, void *Py_UNUSED(ignored)) { PyGenObject *op = _TyGen_CAST(self); /* Not legal to del gen.__qualname__ or to set it to anything @@ -745,28 +745,28 @@ gen_set_qualname(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) } static TyObject * -gen_getyieldfrom(TyObject *gen, void *Ty_UNUSED(ignored)) +gen_getyieldfrom(TyObject *gen, void *Py_UNUSED(ignored)) { TyObject *yf = _TyGen_yf(_TyGen_CAST(gen)); if (yf == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return yf; } static TyObject * -gen_getrunning(TyObject *self, void *Ty_UNUSED(ignored)) +gen_getrunning(TyObject *self, void *Py_UNUSED(ignored)) { PyGenObject *gen = _TyGen_CAST(self); if (gen->gi_frame_state == FRAME_EXECUTING) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * -gen_getsuspended(TyObject *self, void *Ty_UNUSED(ignored)) +gen_getsuspended(TyObject *self, void *Py_UNUSED(ignored)) { PyGenObject *gen = _TyGen_CAST(self); return TyBool_FromLong(FRAME_STATE_SUSPENDED(gen->gi_frame_state)); @@ -779,13 +779,13 @@ _gen_getframe(PyGenObject *gen, const char *const name) return NULL; } if (FRAME_STATE_FINISHED(gen->gi_frame_state)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return _Ty_XNewRef((TyObject *)_TyFrame_GetFrameObject(&gen->gi_iframe)); } static TyObject * -gen_getframe(TyObject *self, void *Ty_UNUSED(ignored)) +gen_getframe(TyObject *self, void *Py_UNUSED(ignored)) { PyGenObject *gen = _TyGen_CAST(self); return _gen_getframe(gen, "gi_frame"); @@ -801,7 +801,7 @@ _gen_getcode(PyGenObject *gen, const char *const name) } static TyObject * -gen_getcode(TyObject *self, void *Ty_UNUSED(ignored)) +gen_getcode(TyObject *self, void *Py_UNUSED(ignored)) { PyGenObject *gen = _TyGen_CAST(self); return _gen_getcode(gen, "gi_code"); @@ -826,7 +826,7 @@ static TyMemberDef gen_memberlist[] = { }; static TyObject * -gen_sizeof(TyObject *op, TyObject *Ty_UNUSED(ignored)) +gen_sizeof(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyGenObject *gen = _TyGen_CAST(op); Ty_ssize_t res; @@ -1038,7 +1038,7 @@ typedef struct { #define _PyCoroWrapper_CAST(op) \ (assert(Ty_IS_TYPE((op), &_PyCoroWrapper_Type)), \ - _Ty_CAST(PyCoroWrapper*, (op))) + _Py_CAST(PyCoroWrapper*, (op))) static int @@ -1123,42 +1123,42 @@ coro_await(TyObject *coro) } static TyObject * -coro_get_cr_await(TyObject *coro, void *Ty_UNUSED(ignored)) +coro_get_cr_await(TyObject *coro, void *Py_UNUSED(ignored)) { TyObject *yf = _TyGen_yf((PyGenObject *) coro); if (yf == NULL) - Ty_RETURN_NONE; + Py_RETURN_NONE; return yf; } static TyObject * -cr_getsuspended(TyObject *self, void *Ty_UNUSED(ignored)) +cr_getsuspended(TyObject *self, void *Py_UNUSED(ignored)) { PyCoroObject *coro = _PyCoroObject_CAST(self); if (FRAME_STATE_SUSPENDED(coro->cr_frame_state)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * -cr_getrunning(TyObject *self, void *Ty_UNUSED(ignored)) +cr_getrunning(TyObject *self, void *Py_UNUSED(ignored)) { PyCoroObject *coro = _PyCoroObject_CAST(self); if (coro->cr_frame_state == FRAME_EXECUTING) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * -cr_getframe(TyObject *coro, void *Ty_UNUSED(ignored)) +cr_getframe(TyObject *coro, void *Py_UNUSED(ignored)) { return _gen_getframe(_TyGen_CAST(coro), "cr_frame"); } static TyObject * -cr_getcode(TyObject *coro, void *Ty_UNUSED(ignored)) +cr_getcode(TyObject *coro, void *Py_UNUSED(ignored)) { return _gen_getcode(_TyGen_CAST(coro), "cr_code"); } @@ -1178,7 +1178,7 @@ static TyGetSetDef coro_getsetlist[] = { }; static TyMemberDef coro_memberlist[] = { - {"cr_origin", _Ty_T_OBJECT, offsetof(PyCoroObject, cr_origin_or_finalizer), Ty_READONLY}, + {"cr_origin", _Ty_T_OBJECT, offsetof(PyCoroObject, cr_origin_or_finalizer), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -1442,7 +1442,7 @@ typedef struct PyAsyncGenASend { } PyAsyncGenASend; #define _PyAsyncGenASend_CAST(op) \ - _Ty_CAST(PyAsyncGenASend*, (op)) + _Py_CAST(PyAsyncGenASend*, (op)) typedef struct PyAsyncGenAThrow { @@ -1467,7 +1467,7 @@ typedef struct _PyAsyncGenWrappedValue { Ty_IS_TYPE(o, &_PyAsyncGenWrappedValue_Type) #define _PyAsyncGenWrappedValue_CAST(op) \ (assert(_PyAsyncGenWrappedValue_CheckExact(op)), \ - _Ty_CAST(_PyAsyncGenWrappedValue*, (op))) + _Py_CAST(_PyAsyncGenWrappedValue*, (op))) static int @@ -1576,25 +1576,25 @@ async_gen_athrow(TyObject *op, TyObject *args) } static TyObject * -ag_getframe(TyObject *ag, void *Ty_UNUSED(ignored)) +ag_getframe(TyObject *ag, void *Py_UNUSED(ignored)) { return _gen_getframe((PyGenObject *)ag, "ag_frame"); } static TyObject * -ag_getcode(TyObject *gen, void *Ty_UNUSED(ignored)) +ag_getcode(TyObject *gen, void *Py_UNUSED(ignored)) { return _gen_getcode((PyGenObject*)gen, "ag_code"); } static TyObject * -ag_getsuspended(TyObject *self, void *Ty_UNUSED(ignored)) +ag_getsuspended(TyObject *self, void *Py_UNUSED(ignored)) { PyAsyncGenObject *ag = _PyAsyncGenObject_CAST(self); if (FRAME_STATE_SUSPENDED(ag->ag_frame_state)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyGetSetDef async_gen_getsetlist[] = { @@ -1612,7 +1612,7 @@ static TyGetSetDef async_gen_getsetlist[] = { static TyMemberDef async_gen_memberlist[] = { {"ag_running", Ty_T_BOOL, offsetof(PyAsyncGenObject, ag_running_async), - Ty_READONLY}, + Py_READONLY}, {NULL} /* Sentinel */ }; @@ -1868,7 +1868,7 @@ async_gen_asend_close(TyObject *self, TyObject *args) { PyAsyncGenASend *o = _PyAsyncGenASend_CAST(self); if (o->ags_state == AWAITABLE_STATE_CLOSED) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *result = async_gen_asend_throw(self, &TyExc_GeneratorExit, 1); @@ -1878,7 +1878,7 @@ async_gen_asend_close(TyObject *self, TyObject *args) TyErr_ExceptionMatches(TyExc_GeneratorExit)) { TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return result; } @@ -2066,7 +2066,7 @@ _PyAsyncGenValueWrapperNew(PyThreadState *tstate, TyObject *val) #define _PyAsyncGenAThrow_CAST(op) \ (assert(Ty_IS_TYPE((op), &_PyAsyncGenAThrow_Type)), \ - _Ty_CAST(PyAsyncGenAThrow*, (op))) + _Py_CAST(PyAsyncGenAThrow*, (op))) static void async_gen_athrow_dealloc(TyObject *self) @@ -2308,7 +2308,7 @@ async_gen_athrow_close(TyObject *self, TyObject *args) { PyAsyncGenAThrow *agt = _PyAsyncGenAThrow_CAST(self); if (agt->agt_state == AWAITABLE_STATE_CLOSED) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *result = async_gen_athrow_throw((TyObject*)agt, &TyExc_GeneratorExit, 1); @@ -2318,7 +2318,7 @@ async_gen_athrow_close(TyObject *self, TyObject *args) TyErr_ExceptionMatches(TyExc_GeneratorExit)) { TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return result; } else { diff --git a/Objects/interpolationobject.c b/Objects/interpolationobject.c index 8900ecc..9c58fb2 100644 --- a/Objects/interpolationobject.c +++ b/Objects/interpolationobject.c @@ -47,7 +47,7 @@ typedef struct { } interpolationobject; #define interpolationobject_CAST(op) \ - (assert(_PyInterpolation_CheckExact(op)), _Ty_CAST(interpolationobject*, (op))) + (assert(_PyInterpolation_CheckExact(op)), _Py_CAST(interpolationobject*, (op))) /*[clinic input] @classmethod @@ -118,15 +118,15 @@ interpolation_repr(TyObject *op) } static TyMemberDef interpolation_members[] = { - {"value", Ty_T_OBJECT_EX, offsetof(interpolationobject, value), Ty_READONLY, "Value"}, - {"expression", Ty_T_OBJECT_EX, offsetof(interpolationobject, expression), Ty_READONLY, "Expression"}, - {"conversion", Ty_T_OBJECT_EX, offsetof(interpolationobject, conversion), Ty_READONLY, "Conversion"}, - {"format_spec", Ty_T_OBJECT_EX, offsetof(interpolationobject, format_spec), Ty_READONLY, "Format specifier"}, + {"value", Ty_T_OBJECT_EX, offsetof(interpolationobject, value), Py_READONLY, "Value"}, + {"expression", Ty_T_OBJECT_EX, offsetof(interpolationobject, expression), Py_READONLY, "Expression"}, + {"conversion", Ty_T_OBJECT_EX, offsetof(interpolationobject, conversion), Py_READONLY, "Conversion"}, + {"format_spec", Ty_T_OBJECT_EX, offsetof(interpolationobject, format_spec), Py_READONLY, "Format specifier"}, {NULL} }; static TyObject* -interpolation_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +interpolation_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { interpolationobject *self = interpolationobject_CAST(op); return Ty_BuildValue("(O(OOOO))", (TyObject *)Ty_TYPE(op), diff --git a/Objects/iterobject.c b/Objects/iterobject.c index 7789720..9ca956f 100644 --- a/Objects/iterobject.c +++ b/Objects/iterobject.c @@ -83,7 +83,7 @@ iter_iternext(TyObject *iterator) } static TyObject * -iter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) +iter_len(TyObject *op, TyObject *Py_UNUSED(ignored)) { seqiterobject *it = (seqiterobject*)op; Ty_ssize_t seqsize, len; @@ -95,7 +95,7 @@ iter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) return NULL; } else { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } len = seqsize - it->it_index; if (len >= 0) @@ -107,7 +107,7 @@ iter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -iter_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +iter_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { seqiterobject *it = (seqiterobject*)op; TyObject *iter = _TyEval_GetBuiltin(&_Ty_ID(iter)); @@ -136,7 +136,7 @@ iter_setstate(TyObject *op, TyObject *state) index = 0; it->it_index = index; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(setstate_doc, "Set state information for unpickling."); @@ -234,7 +234,7 @@ calliter_iternext(TyObject *op) if (result != NULL && it->it_sentinel != NULL){ int ok; - ok = PyObject_RichCompareBool(it->it_sentinel, result, Ty_EQ); + ok = PyObject_RichCompareBool(it->it_sentinel, result, Py_EQ); if (ok == 0) { return result; /* Common case, fast path */ } @@ -254,7 +254,7 @@ calliter_iternext(TyObject *op) } static TyObject * -calliter_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +calliter_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { calliterobject *it = (calliterobject*)op; TyObject *iter = _TyEval_GetBuiltin(&_Ty_ID(iter)); @@ -453,7 +453,7 @@ anextawaitable_throw(TyObject *op, TyObject *args) static TyObject * -anextawaitable_close(TyObject *op, TyObject *Ty_UNUSED(dummy)) +anextawaitable_close(TyObject *op, TyObject *Py_UNUSED(dummy)) { anextawaitableobject *obj = anextawaitableobject_CAST(op); return anextawaitable_proxy(obj, "close", NULL); diff --git a/Objects/listobject.c b/Objects/listobject.c index 0a59f6a..2d44c08 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -656,7 +656,7 @@ list_contains(TyObject *aa, TyObject *el) // out-of-bounds return 0; } - int cmp = PyObject_RichCompareBool(item, el, Ty_EQ); + int cmp = PyObject_RichCompareBool(item, el, Py_EQ); Ty_DECREF(item); if (cmp != 0) { return cmp; @@ -1129,7 +1129,7 @@ list_insert_impl(PyListObject *self, Ty_ssize_t index, TyObject *object) /*[clinic end generated code: output=7f35e32f60c8cb78 input=b1987ca998a4ae2d]*/ { if (ins1(self, index, object) == 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return NULL; } @@ -1146,7 +1146,7 @@ py_list_clear_impl(PyListObject *self) /*[clinic end generated code: output=83726743807e3518 input=e285b7f09051a9ba]*/ { list_clear(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1180,7 +1180,7 @@ list_append_impl(PyListObject *self, TyObject *object) if (_TyList_AppendTakeRef(self, Ty_NewRef(object)) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -1471,7 +1471,7 @@ list_extend_impl(PyListObject *self, TyObject *iterable) if (_list_extend(self, iterable) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject * @@ -2724,7 +2724,7 @@ static int safe_object_compare(TyObject *v, TyObject *w, MergeState *ms) { /* No assumptions necessary! */ - return PyObject_RichCompareBool(v, w, Ty_LT); + return PyObject_RichCompareBool(v, w, Py_LT); } /* Homogeneous compare: safe for any two comparable objects of the same type. @@ -2738,14 +2738,14 @@ unsafe_object_compare(TyObject *v, TyObject *w, MergeState *ms) /* No assumptions, because we check first: */ if (Ty_TYPE(v)->tp_richcompare != ms->key_richcompare) - return PyObject_RichCompareBool(v, w, Ty_LT); + return PyObject_RichCompareBool(v, w, Py_LT); assert(ms->key_richcompare != NULL); - res_obj = (*(ms->key_richcompare))(v, w, Ty_LT); + res_obj = (*(ms->key_richcompare))(v, w, Py_LT); if (res_obj == Ty_NotImplemented) { Ty_DECREF(res_obj); - return PyObject_RichCompareBool(v, w, Ty_LT); + return PyObject_RichCompareBool(v, w, Py_LT); } if (res_obj == NULL) return -1; @@ -2759,7 +2759,7 @@ unsafe_object_compare(TyObject *v, TyObject *w, MergeState *ms) Ty_DECREF(res_obj); /* Note that we can't assert - * res == PyObject_RichCompareBool(v, w, Ty_LT); + * res == PyObject_RichCompareBool(v, w, Py_LT); * because of evil compare functions like this: * lambda a, b: int(random.random() * 3) - 1) * (which is actually in test_sort.py) */ @@ -2786,7 +2786,7 @@ unsafe_latin_compare(TyObject *v, TyObject *w, MergeState *ms) res < 0 : TyUnicode_GET_LENGTH(v) < TyUnicode_GET_LENGTH(w)); - assert(res == PyObject_RichCompareBool(v, w, Ty_LT));; + assert(res == PyObject_RichCompareBool(v, w, Py_LT));; return res; } @@ -2811,7 +2811,7 @@ unsafe_long_compare(TyObject *v, TyObject *w, MergeState *ms) w0 = _TyLong_CompactValue(wl); res = v0 < w0; - assert(res == PyObject_RichCompareBool(v, w, Ty_LT)); + assert(res == PyObject_RichCompareBool(v, w, Py_LT)); return res; } @@ -2826,7 +2826,7 @@ unsafe_float_compare(TyObject *v, TyObject *w, MergeState *ms) assert(Ty_IS_TYPE(w, &TyFloat_Type)); res = TyFloat_AS_DOUBLE(v) < TyFloat_AS_DOUBLE(w); - assert(res == PyObject_RichCompareBool(v, w, Ty_LT)); + assert(res == PyObject_RichCompareBool(v, w, Py_LT)); return res; } @@ -2856,7 +2856,7 @@ unsafe_tuple_compare(TyObject *v, TyObject *w, MergeState *ms) wlen = Ty_SIZE(wt); for (i = 0; i < vlen && i < wlen; i++) { - k = PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i], Ty_EQ); + k = PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i], Py_EQ); if (k < 0) return -1; if (!k) @@ -2869,7 +2869,7 @@ unsafe_tuple_compare(TyObject *v, TyObject *w, MergeState *ms) if (i == 0) return ms->tuple_elem_compare(vt->ob_item[i], wt->ob_item[i], ms); else - return PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i], Ty_LT); + return PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i], Py_LT); } /* An adaptive, stable, natural mergesort. See listsort.txt. @@ -3192,7 +3192,7 @@ list_reverse_impl(PyListObject *self) { if (Ty_SIZE(self) > 1) reverse_slice(self->ob_item, self->ob_item + Ty_SIZE(self)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } int @@ -3300,7 +3300,7 @@ list_index_impl(PyListObject *self, TyObject *value, Ty_ssize_t start, // out-of-bounds break; } - int cmp = PyObject_RichCompareBool(obj, value, Ty_EQ); + int cmp = PyObject_RichCompareBool(obj, value, Py_EQ); Ty_DECREF(obj); if (cmp > 0) return TyLong_FromSsize_t(i); @@ -3336,7 +3336,7 @@ list_count_impl(PyListObject *self, TyObject *value) Ty_DECREF(obj); continue; } - int cmp = PyObject_RichCompareBool(obj, value, Ty_EQ); + int cmp = PyObject_RichCompareBool(obj, value, Py_EQ); Ty_DECREF(obj); if (cmp > 0) count++; @@ -3367,11 +3367,11 @@ list_remove_impl(PyListObject *self, TyObject *value) for (i = 0; i < Ty_SIZE(self); i++) { TyObject *obj = self->ob_item[i]; Ty_INCREF(obj); - int cmp = PyObject_RichCompareBool(obj, value, Ty_EQ); + int cmp = PyObject_RichCompareBool(obj, value, Py_EQ); Ty_DECREF(obj); if (cmp > 0) { if (list_ass_slice_lock_held(self, i, i+1, NULL) == 0) - Ty_RETURN_NONE; + Py_RETURN_NONE; return NULL; } else if (cmp < 0) @@ -3399,17 +3399,17 @@ list_richcompare_impl(TyObject *v, TyObject *w, int op) Ty_ssize_t i; if (!TyList_Check(v) || !TyList_Check(w)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; vl = (PyListObject *)v; wl = (PyListObject *)w; - if (Ty_SIZE(vl) != Ty_SIZE(wl) && (op == Ty_EQ || op == Ty_NE)) { + if (Ty_SIZE(vl) != Ty_SIZE(wl) && (op == Py_EQ || op == Py_NE)) { /* Shortcut: if the lengths differ, the lists differ */ - if (op == Ty_EQ) - Ty_RETURN_FALSE; + if (op == Py_EQ) + Py_RETURN_FALSE; else - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /* Search for the first index where items are different */ @@ -3422,7 +3422,7 @@ list_richcompare_impl(TyObject *v, TyObject *w, int op) Ty_INCREF(vitem); Ty_INCREF(witem); - int k = PyObject_RichCompareBool(vitem, witem, Ty_EQ); + int k = PyObject_RichCompareBool(vitem, witem, Py_EQ); Ty_DECREF(vitem); Ty_DECREF(witem); if (k < 0) @@ -3433,15 +3433,15 @@ list_richcompare_impl(TyObject *v, TyObject *w, int op) if (i >= Ty_SIZE(vl) || i >= Ty_SIZE(wl)) { /* No more items to compare -- compare sizes */ - Ty_RETURN_RICHCOMPARE(Ty_SIZE(vl), Ty_SIZE(wl), op); + Py_RETURN_RICHCOMPARE(Ty_SIZE(vl), Ty_SIZE(wl), op); } /* We have an item that differs -- shortcuts for EQ/NE */ - if (op == Ty_EQ) { - Ty_RETURN_FALSE; + if (op == Py_EQ) { + Py_RETURN_FALSE; } - if (op == Ty_NE) { - Ty_RETURN_TRUE; + if (op == Py_NE) { + Py_RETURN_TRUE; } /* Compare the final item again using the proper operator */ @@ -4033,7 +4033,7 @@ listiter_next(TyObject *self) } static TyObject * -listiter_len(TyObject *self, TyObject *Ty_UNUSED(ignored)) +listiter_len(TyObject *self, TyObject *Py_UNUSED(ignored)) { assert(self != NULL); _PyListIterObject *it = (_PyListIterObject *)self; @@ -4047,7 +4047,7 @@ listiter_len(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -listiter_reduce(TyObject *it, TyObject *Ty_UNUSED(ignored)) +listiter_reduce(TyObject *it, TyObject *Py_UNUSED(ignored)) { return listiter_reduce_general(it, 1); } @@ -4066,7 +4066,7 @@ listiter_setstate(TyObject *self, TyObject *state) index = TyList_GET_SIZE(it->it_seq); /* iterator exhausted */ FT_ATOMIC_STORE_SSIZE_RELAXED(it->it_index, index); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*********************** List Reverse Iterator **************************/ @@ -4188,7 +4188,7 @@ listreviter_next(TyObject *self) } static TyObject * -listreviter_len(TyObject *self, TyObject *Ty_UNUSED(ignored)) +listreviter_len(TyObject *self, TyObject *Py_UNUSED(ignored)) { listreviterobject *it = (listreviterobject *)self; Ty_ssize_t index = FT_ATOMIC_LOAD_SSIZE_RELAXED(it->it_index); @@ -4199,7 +4199,7 @@ listreviter_len(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject * -listreviter_reduce(TyObject *it, TyObject *Ty_UNUSED(ignored)) +listreviter_reduce(TyObject *it, TyObject *Py_UNUSED(ignored)) { return listiter_reduce_general(it, 0); } @@ -4218,7 +4218,7 @@ listreviter_setstate(TyObject *self, TyObject *state) index = TyList_GET_SIZE(it->it_seq) - 1; FT_ATOMIC_STORE_SSIZE_RELAXED(it->it_index, index); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* common pickling support */ diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 062e361..8fe9775 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -1132,7 +1132,7 @@ memoryview_release_impl(PyMemoryViewObject *self) Ty_ssize_t exports = get_exports(self); if (exports == 0) { _memory_release(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (exports > 0) { @@ -2801,7 +2801,7 @@ memoryview_count_impl(PyMemoryViewObject *self, TyObject *value) count++; // no overflow since count <= len(mv) <= PY_SSIZE_T_MAX continue; } - int contained = PyObject_RichCompareBool(item, value, Ty_EQ); + int contained = PyObject_RichCompareBool(item, value, Py_EQ); Ty_DECREF(item); if (contained > 0) { // more likely than 'contained < 0' count++; // no overflow since count <= len(mv) <= PY_SSIZE_T_MAX @@ -2881,7 +2881,7 @@ memoryview_index_impl(PyMemoryViewObject *self, TyObject *value, Ty_DECREF(item); return TyLong_FromSsize_t(index); } - int contained = PyObject_RichCompareBool(item, value, Ty_EQ); + int contained = PyObject_RichCompareBool(item, value, Py_EQ); Ty_DECREF(item); if (contained > 0) { // more likely than 'contained < 0' return TyLong_FromSsize_t(index); @@ -2945,7 +2945,7 @@ struct_unpack_cmp(const char *p, const char *q, } /* MV_COMPARE_EX == -1: exceptions are preserved */ - ret = PyObject_RichCompareBool(v, w, Ty_EQ); + ret = PyObject_RichCompareBool(v, w, Py_EQ); Ty_DECREF(v); Ty_DECREF(w); @@ -3103,7 +3103,7 @@ memory_richcompare(TyObject *v, TyObject *w, int op) char vfmt, wfmt; int equal = MV_COMPARE_NOT_IMPL; - if (op != Ty_EQ && op != Ty_NE) + if (op != Py_EQ && op != Py_NE) goto result; /* Ty_NotImplemented */ assert(TyMemoryView_Check(v)); @@ -3181,7 +3181,7 @@ result: else /* exception */ res = NULL; } - else if ((equal && op == Ty_EQ) || (!equal && op == Ty_NE)) + else if ((equal && op == Py_EQ) || (!equal && op == Py_NE)) res = Ty_True; else res = Ty_False; @@ -3279,20 +3279,20 @@ _IntTupleFromSsizet(int len, Ty_ssize_t *vals) } static TyObject * -memory_obj_get(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_obj_get(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; Ty_buffer *view = &self->view; CHECK_RELEASED(self); if (view->obj == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(view->obj); } static TyObject * -memory_nbytes_get(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_nbytes_get(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3300,7 +3300,7 @@ memory_nbytes_get(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_format_get(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_format_get(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3308,7 +3308,7 @@ memory_format_get(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_itemsize_get(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_itemsize_get(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3316,7 +3316,7 @@ memory_itemsize_get(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_shape_get(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_shape_get(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3324,7 +3324,7 @@ memory_shape_get(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_strides_get(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_strides_get(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3332,7 +3332,7 @@ memory_strides_get(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_suboffsets_get(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_suboffsets_get(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3340,7 +3340,7 @@ memory_suboffsets_get(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_readonly_get(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_readonly_get(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3348,7 +3348,7 @@ memory_readonly_get(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_ndim_get(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_ndim_get(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3356,7 +3356,7 @@ memory_ndim_get(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_c_contiguous(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_c_contiguous(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3364,7 +3364,7 @@ memory_c_contiguous(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_f_contiguous(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_f_contiguous(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); @@ -3372,7 +3372,7 @@ memory_f_contiguous(TyObject *_self, void *Ty_UNUSED(ignored)) } static TyObject * -memory_contiguous(TyObject *_self, void *Ty_UNUSED(ignored)) +memory_contiguous(TyObject *_self, void *Py_UNUSED(ignored)) { PyMemoryViewObject *self = (PyMemoryViewObject *)_self; CHECK_RELEASED(self); diff --git a/Objects/methodobject.c b/Objects/methodobject.c index 3b26e62..451107d 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -189,7 +189,7 @@ meth_dealloc(TyObject *self) } static TyObject * -meth_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +meth_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { PyCFunctionObject *m = _PyCFunctionObject_CAST(self); if (m->m_self == NULL || TyModule_Check(m->m_self)) @@ -321,18 +321,18 @@ meth_richcompare(TyObject *self, TyObject *other, int op) TyObject *res; int eq; - if ((op != Ty_EQ && op != Ty_NE) || + if ((op != Py_EQ && op != Py_NE) || !PyCFunction_Check(self) || !PyCFunction_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } a = (PyCFunctionObject *)self; b = (PyCFunctionObject *)other; eq = a->m_self == b->m_self; if (eq) eq = a->m_ml->ml_meth == b->m_ml->ml_meth; - if (op == Ty_EQ) + if (op == Py_EQ) res = eq ? Ty_True : Ty_False; else res = eq ? Ty_False : Ty_True; diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 26cdc6f..1cdf57c 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -20,11 +20,11 @@ #define _TyModule_CAST(op) \ - (assert(TyModule_Check(op)), _Ty_CAST(PyModuleObject*, (op))) + (assert(TyModule_Check(op)), _Py_CAST(PyModuleObject*, (op))) static TyMemberDef module_members[] = { - {"__dict__", _Ty_T_OBJECT, offsetof(PyModuleObject, md_dict), Ty_READONLY}, + {"__dict__", _Ty_T_OBJECT, offsetof(PyModuleObject, md_dict), Py_READONLY}, {0} }; @@ -618,7 +618,7 @@ _TyModule_GetFilenameObject(TyObject *mod) TyObject *dict = ((PyModuleObject *)mod)->md_dict; // borrowed reference if (dict == NULL) { // The module has been tampered with. - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *fileobj; int res = TyDict_GetItemRef(dict, &_Ty_ID(__file__), &fileobj); @@ -632,11 +632,11 @@ _TyModule_GetFilenameObject(TyObject *mod) // it's a namespace package or other module with a loader that // isn't disk-based. It could also be that a user created // a module manually but without manually setting __file__. - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (!TyUnicode_Check(fileobj)) { Ty_DECREF(fileobj); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return fileobj; } @@ -1230,7 +1230,7 @@ module_get_dict(PyModuleObject *m) } static TyObject * -module_get_annotate(TyObject *self, void *Ty_UNUSED(ignored)) +module_get_annotate(TyObject *self, void *Py_UNUSED(ignored)) { PyModuleObject *m = _TyModule_CAST(self); @@ -1251,7 +1251,7 @@ module_get_annotate(TyObject *self, void *Ty_UNUSED(ignored)) } static int -module_set_annotate(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) +module_set_annotate(TyObject *self, TyObject *value, void *Py_UNUSED(ignored)) { PyModuleObject *m = _TyModule_CAST(self); if (value == NULL) { @@ -1285,7 +1285,7 @@ module_set_annotate(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) } static TyObject * -module_get_annotations(TyObject *self, void *Ty_UNUSED(ignored)) +module_get_annotations(TyObject *self, void *Py_UNUSED(ignored)) { PyModuleObject *m = _TyModule_CAST(self); @@ -1356,7 +1356,7 @@ module_get_annotations(TyObject *self, void *Ty_UNUSED(ignored)) } static int -module_set_annotations(TyObject *self, TyObject *value, void *Ty_UNUSED(ignored)) +module_set_annotations(TyObject *self, TyObject *value, void *Py_UNUSED(ignored)) { PyModuleObject *m = _TyModule_CAST(self); diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c index f470bdb..7f5585d 100644 --- a/Objects/namespaceobject.c +++ b/Objects/namespaceobject.c @@ -12,11 +12,11 @@ typedef struct { TyObject *ns_dict; } _PyNamespaceObject; -#define _PyNamespace_CAST(op) _Ty_CAST(_PyNamespaceObject*, (op)) +#define _PyNamespace_CAST(op) _Py_CAST(_PyNamespaceObject*, (op)) static TyMemberDef namespace_members[] = { - {"__dict__", _Ty_T_OBJECT, offsetof(_PyNamespaceObject, ns_dict), Ty_READONLY}, + {"__dict__", _Ty_T_OBJECT, offsetof(_PyNamespaceObject, ns_dict), Py_READONLY}, {NULL} }; @@ -198,14 +198,14 @@ namespace_richcompare(TyObject *self, TyObject *other, int op) PyObject_TypeCheck(other, &_PyNamespace_Type)) return PyObject_RichCompare(((_PyNamespaceObject *)self)->ns_dict, ((_PyNamespaceObject *)other)->ns_dict, op); - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } PyDoc_STRVAR(namespace_reduce__doc__, "Return state information for pickling"); static TyObject * -namespace_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +namespace_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { _PyNamespaceObject *ns = (_PyNamespaceObject*)op; TyObject *result, *args = TyTuple_New(0); diff --git a/Objects/object.c b/Objects/object.c index 65c511b..be0313f 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -982,7 +982,7 @@ _TyObject_FunctionStr(TyObject *x) TyObject *result = NULL; ret = PyObject_GetOptionalAttr(x, &_Ty_ID(__module__), &module); if (module != NULL && module != Ty_None) { - ret = PyObject_RichCompareBool(module, &_Ty_ID(builtins), Ty_NE); + ret = PyObject_RichCompareBool(module, &_Ty_ID(builtins), Py_NE); if (ret < 0) { // error goto done; @@ -1033,7 +1033,7 @@ done: */ /* Map rich comparison operators to their swapped version, e.g. LT <--> GT */ -int _Ty_SwappedOp[] = {Ty_GT, Ty_GE, Ty_EQ, Ty_NE, Ty_LT, Ty_LE}; +int _Ty_SwappedOp[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE}; static const char * const opstrings[] = {"<", "<=", "==", "!=", ">", ">="}; @@ -1070,10 +1070,10 @@ do_richcompare(PyThreadState *tstate, TyObject *v, TyObject *w, int op) /* If neither object implements it, provide a sensible default for == and !=, but raise an exception for ordering. */ switch (op) { - case Ty_EQ: + case Py_EQ: res = (v == w) ? Ty_True : Ty_False; break; - case Ty_NE: + case Py_NE: res = (v != w) ? Ty_True : Ty_False; break; default: @@ -1095,7 +1095,7 @@ PyObject_RichCompare(TyObject *v, TyObject *w, int op) { PyThreadState *tstate = _TyThreadState_GET(); - assert(Ty_LT <= op && op <= Ty_GE); + assert(Py_LT <= op && op <= Py_GE); if (v == NULL || w == NULL) { if (!_TyErr_Occurred(tstate)) { TyErr_BadInternalCall(); @@ -1121,9 +1121,9 @@ PyObject_RichCompareBool(TyObject *v, TyObject *w, int op) /* Quick result when objects are the same. Guarantees that identity implies equality. */ if (v == w) { - if (op == Ty_EQ) + if (op == Py_EQ) return 1; - else if (op == Ty_NE) + else if (op == Py_NE) return 0; } @@ -2082,7 +2082,7 @@ none_new(TyTypeObject *type, TyObject *args, TyObject *kwargs) TyErr_SetString(TyExc_TypeError, "NoneType takes no arguments"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -2191,7 +2191,7 @@ NotImplemented_repr(TyObject *op) } static TyObject * -NotImplemented_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +NotImplemented_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { return TyUnicode_FromString("NotImplemented"); } @@ -2208,7 +2208,7 @@ notimplemented_new(TyTypeObject *type, TyObject *args, TyObject *kwargs) TyErr_SetString(TyExc_TypeError, "NotImplementedType takes no arguments"); return NULL; } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } static void diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index 86b5954..d1853dc 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -52,7 +52,7 @@ static void set_allocator_unlocked(PyMemAllocatorDomain, PyMemAllocatorEx *); /* the default raw allocator (wraps malloc) */ void * -_TyMem_RawMalloc(void *Ty_UNUSED(ctx), size_t size) +_TyMem_RawMalloc(void *Py_UNUSED(ctx), size_t size) { /* TyMem_RawMalloc(0) means malloc(1). Some systems would return NULL for malloc(0), which would be treated as an error. Some platforms would @@ -64,7 +64,7 @@ _TyMem_RawMalloc(void *Ty_UNUSED(ctx), size_t size) } void * -_TyMem_RawCalloc(void *Ty_UNUSED(ctx), size_t nelem, size_t elsize) +_TyMem_RawCalloc(void *Py_UNUSED(ctx), size_t nelem, size_t elsize) { /* TyMem_RawCalloc(0, 0) means calloc(1, 1). Some systems would return NULL for calloc(0, 0), which would be treated as an error. Some platforms @@ -78,7 +78,7 @@ _TyMem_RawCalloc(void *Ty_UNUSED(ctx), size_t nelem, size_t elsize) } void * -_TyMem_RawRealloc(void *Ty_UNUSED(ctx), void *ptr, size_t size) +_TyMem_RawRealloc(void *Py_UNUSED(ctx), void *ptr, size_t size) { if (size == 0) size = 1; @@ -86,7 +86,7 @@ _TyMem_RawRealloc(void *Ty_UNUSED(ctx), void *ptr, size_t size) } void -_TyMem_RawFree(void *Ty_UNUSED(ctx), void *ptr) +_TyMem_RawFree(void *Py_UNUSED(ctx), void *ptr) { free(ptr); } @@ -455,7 +455,7 @@ _TyMem_DefaultRawWcsdup(const wchar_t *str) #endif void * -_TyMem_ArenaAlloc(void *Ty_UNUSED(ctx), size_t size) +_TyMem_ArenaAlloc(void *Py_UNUSED(ctx), size_t size) { #ifdef MS_WINDOWS return VirtualAlloc(NULL, size, @@ -474,11 +474,11 @@ _TyMem_ArenaAlloc(void *Ty_UNUSED(ctx), size_t size) } void -_TyMem_ArenaFree(void *Ty_UNUSED(ctx), void *ptr, +_TyMem_ArenaFree(void *Py_UNUSED(ctx), void *ptr, #if defined(ARENAS_USE_MMAP) size_t size #else - size_t Ty_UNUSED(size) + size_t Py_UNUSED(size) #endif ) { @@ -1998,7 +1998,7 @@ new_arena(OMState *state) pymalloc. When the radix tree is used, 'poolp' is unused. */ static bool -address_in_range(OMState *state, void *p, poolp Ty_UNUSED(pool)) +address_in_range(OMState *state, void *p, poolp Py_UNUSED(pool)) { return arena_map_is_used(state, p); } @@ -2259,7 +2259,7 @@ allocate_from_new_pool(OMState *state, uint size) or when the max memory limit has been reached. */ static inline void* -pymalloc_alloc(OMState *state, void *Ty_UNUSED(ctx), size_t nbytes) +pymalloc_alloc(OMState *state, void *Py_UNUSED(ctx), size_t nbytes) { #ifdef WITH_VALGRIND if (UNLIKELY(running_on_valgrind == -1)) { @@ -2531,7 +2531,7 @@ insert_to_freepool(OMState *state, poolp pool) Return 1 if it was freed. Return 0 if the block was not allocated by pymalloc_alloc(). */ static inline int -pymalloc_free(OMState *state, void *Ty_UNUSED(ctx), void *p) +pymalloc_free(OMState *state, void *Py_UNUSED(ctx), void *p) { assert(p != NULL); @@ -2700,7 +2700,7 @@ _TyObject_Realloc(void *ctx, void *ptr, size_t nbytes) * only be used by extensions that are compiled with pymalloc enabled. */ Ty_ssize_t -_TyInterpreterState_GetAllocatedBlocks(PyInterpreterState *Ty_UNUSED(interp)) +_TyInterpreterState_GetAllocatedBlocks(PyInterpreterState *Py_UNUSED(interp)) { return 0; } @@ -2712,13 +2712,13 @@ _Ty_GetGlobalAllocatedBlocks(void) } void -_TyInterpreterState_FinalizeAllocatedBlocks(PyInterpreterState *Ty_UNUSED(interp)) +_TyInterpreterState_FinalizeAllocatedBlocks(PyInterpreterState *Py_UNUSED(interp)) { return; } void -_Ty_FinalizeAllocatedBlocks(_PyRuntimeState *Ty_UNUSED(runtime)) +_Ty_FinalizeAllocatedBlocks(_PyRuntimeState *Py_UNUSED(runtime)) { return; } diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 056c363..ac1b2bc 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -502,7 +502,7 @@ struct _odictobject { TyObject *od_weakreflist; /* holds weakrefs to the odict */ }; -#define _PyODictObject_CAST(op) _Ty_CAST(PyODictObject*, (op)) +#define _PyODictObject_CAST(op) _Py_CAST(PyODictObject*, (op)) /* ---------------------------------------------- @@ -829,7 +829,7 @@ _odict_keys_equal(PyODictObject *a, PyODictObject *b) else { TyObject *key_a = Ty_NewRef(_odictnode_KEY(node_a)); TyObject *key_b = Ty_NewRef(_odictnode_KEY(node_b)); - int res = PyObject_RichCompareBool(key_a, key_b, Ty_EQ); + int res = PyObject_RichCompareBool(key_a, key_b, Py_EQ); Ty_DECREF(key_a); Ty_DECREF(key_b); if (res < 0) { @@ -898,7 +898,7 @@ odict_or(TyObject *left, TyObject *right) other = left; } if (!TyDict_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } TyObject *new = PyObject_CallOneArg((TyObject*)type, left); if (!new) { @@ -957,7 +957,7 @@ OrderedDict_fromkeys_impl(TyTypeObject *type, TyObject *seq, TyObject *value) PyDoc_STRVAR(odict_sizeof__doc__, ""); static TyObject * -odict_sizeof(TyObject *op, TyObject *Ty_UNUSED(ignored)) +odict_sizeof(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyODictObject *od = _PyODictObject_CAST(op); Ty_ssize_t res = _TyDict_SizeOf((PyDictObject *)od); @@ -973,7 +973,7 @@ odict_sizeof(TyObject *op, TyObject *Ty_UNUSED(ignored)) PyDoc_STRVAR(odict_reduce__doc__, "Return state information for pickling"); static TyObject * -odict_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +odict_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { register PyODictObject *od = _PyODictObject_CAST(op); TyObject *state, *result = NULL; @@ -1166,21 +1166,21 @@ OrderedDict_popitem_impl(PyODictObject *self, int last) /* MutableMapping.keys() does not have a docstring. */ PyDoc_STRVAR(odict_keys__doc__, ""); -static TyObject * odictkeys_new(TyObject *od, TyObject *Ty_UNUSED(ignored)); /* forward */ +static TyObject * odictkeys_new(TyObject *od, TyObject *Py_UNUSED(ignored)); /* forward */ /* values() */ /* MutableMapping.values() does not have a docstring. */ PyDoc_STRVAR(odict_values__doc__, ""); -static TyObject * odictvalues_new(TyObject *od, TyObject *Ty_UNUSED(ignored)); /* forward */ +static TyObject * odictvalues_new(TyObject *od, TyObject *Py_UNUSED(ignored)); /* forward */ /* items() */ /* MutableMapping.items() does not have a docstring. */ PyDoc_STRVAR(odict_items__doc__, ""); -static TyObject * odictitems_new(TyObject *od, TyObject *Ty_UNUSED(ignored)); /* forward */ +static TyObject * odictitems_new(TyObject *od, TyObject *Py_UNUSED(ignored)); /* forward */ /* update() */ @@ -1198,12 +1198,12 @@ PyDoc_STRVAR(odict_clear__doc__, "od.clear() -> None. Remove all items from od."); static TyObject * -odict_clear(TyObject *op, TyObject *Ty_UNUSED(ignored)) +odict_clear(TyObject *op, TyObject *Py_UNUSED(ignored)) { register PyODictObject *od = _PyODictObject_CAST(op); TyDict_Clear(op); _odict_clear_nodes(od); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* copy() */ @@ -1215,7 +1215,7 @@ static int _PyODict_SetItem_KnownHash(TyObject *, TyObject *, TyObject *, PyDoc_STRVAR(odict_copy__doc__, "od.copy() -> a shallow copy of od"); static TyObject * -odict_copy(TyObject *op, TyObject *Ty_UNUSED(ignored)) +odict_copy(TyObject *op, TyObject *Py_UNUSED(ignored)) { register PyODictObject *od = _PyODictObject_CAST(op); _ODictNode *node; @@ -1276,7 +1276,7 @@ PyDoc_STRVAR(odict_reversed__doc__, "od.__reversed__() <==> reversed(od)"); static TyObject * odictiter_new(PyODictObject *, int); static TyObject * -odict_reversed(TyObject *op, TyObject *Ty_UNUSED(ignored)) +odict_reversed(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyODictObject *od = _PyODictObject_CAST(op); return odictiter_new(od, _odict_ITER_KEYS|_odict_ITER_REVERSED); @@ -1329,7 +1329,7 @@ OrderedDict_move_to_end_impl(PyODictObject *self, TyObject *key, int last) } } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1468,10 +1468,10 @@ static TyObject * odict_richcompare(TyObject *v, TyObject *w, int op) { if (!PyODict_Check(v) || !TyDict_Check(w)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } - if (op == Ty_EQ || op == Ty_NE) { + if (op == Py_EQ || op == Py_NE) { TyObject *res, *cmp; int eq; @@ -1480,9 +1480,9 @@ odict_richcompare(TyObject *v, TyObject *w, int op) return NULL; if (!PyODict_Check(w)) return cmp; - if (op == Ty_EQ && cmp == Ty_False) + if (op == Py_EQ && cmp == Ty_False) return cmp; - if (op == Ty_NE && cmp == Ty_True) + if (op == Py_NE && cmp == Ty_True) return cmp; Ty_DECREF(cmp); @@ -1491,10 +1491,10 @@ odict_richcompare(TyObject *v, TyObject *w, int op) if (eq < 0) return NULL; - res = (eq == (op == Ty_EQ)) ? Ty_True : Ty_False; + res = (eq == (op == Py_EQ)) ? Ty_True : Ty_False; return Ty_NewRef(res); } else { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } } @@ -1786,7 +1786,7 @@ done: PyDoc_STRVAR(reduce_doc, "Return state information for pickling"); static TyObject * -odictiter_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +odictiter_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { odictiterobject *di = (odictiterobject*)op; @@ -1883,18 +1883,18 @@ odictkeys_iter(TyObject *op) { _PyDictViewObject *dv = (_PyDictViewObject*)op; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return odictiter_new(_PyODictObject_CAST(dv->dv_dict), _odict_ITER_KEYS); } static TyObject * -odictkeys_reversed(TyObject *op, TyObject *Ty_UNUSED(ignored)) +odictkeys_reversed(TyObject *op, TyObject *Py_UNUSED(ignored)) { _PyDictViewObject *dv = (_PyDictViewObject*)op; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return odictiter_new(_PyODictObject_CAST(dv->dv_dict), _odict_ITER_KEYS|_odict_ITER_REVERSED); @@ -1940,7 +1940,7 @@ TyTypeObject PyODictKeys_Type = { }; static TyObject * -odictkeys_new(TyObject *od, TyObject *Ty_UNUSED(ignored)) +odictkeys_new(TyObject *od, TyObject *Py_UNUSED(ignored)) { return _PyDictView_New(od, &PyODictKeys_Type); } @@ -1952,18 +1952,18 @@ odictitems_iter(TyObject *op) { _PyDictViewObject *dv = (_PyDictViewObject*)op; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return odictiter_new(_PyODictObject_CAST(dv->dv_dict), _odict_ITER_KEYS|_odict_ITER_VALUES); } static TyObject * -odictitems_reversed(TyObject *op, TyObject *Ty_UNUSED(ignored)) +odictitems_reversed(TyObject *op, TyObject *Py_UNUSED(ignored)) { _PyDictViewObject *dv = (_PyDictViewObject*)op; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return odictiter_new(_PyODictObject_CAST(dv->dv_dict), _odict_ITER_KEYS|_odict_ITER_VALUES|_odict_ITER_REVERSED); @@ -2009,7 +2009,7 @@ TyTypeObject PyODictItems_Type = { }; static TyObject * -odictitems_new(TyObject *od, TyObject *Ty_UNUSED(ignored)) +odictitems_new(TyObject *od, TyObject *Py_UNUSED(ignored)) { return _PyDictView_New(od, &PyODictItems_Type); } @@ -2021,18 +2021,18 @@ odictvalues_iter(TyObject *op) { _PyDictViewObject *dv = (_PyDictViewObject*)op; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return odictiter_new(_PyODictObject_CAST(dv->dv_dict), _odict_ITER_VALUES); } static TyObject * -odictvalues_reversed(TyObject *op, TyObject *Ty_UNUSED(ignored)) +odictvalues_reversed(TyObject *op, TyObject *Py_UNUSED(ignored)) { _PyDictViewObject *dv = (_PyDictViewObject*)op; if (dv->dv_dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return odictiter_new(_PyODictObject_CAST(dv->dv_dict), _odict_ITER_VALUES|_odict_ITER_REVERSED); @@ -2078,7 +2078,7 @@ TyTypeObject PyODictValues_Type = { }; static TyObject * -odictvalues_new(TyObject *od, TyObject *Ty_UNUSED(ignored)) +odictvalues_new(TyObject *od, TyObject *Py_UNUSED(ignored)) { return _PyDictView_New(od, &PyODictValues_Type); } @@ -2288,5 +2288,5 @@ mutablemapping_update(TyObject *self, TyObject *args, TyObject *kwargs) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Objects/picklebufobject.c b/Objects/picklebufobject.c index 6cfa843..5ae9d28 100644 --- a/Objects/picklebufobject.c +++ b/Objects/picklebufobject.c @@ -149,7 +149,7 @@ static PyBufferProcs picklebuf_as_buffer = { /* Methods */ static TyObject * -picklebuf_raw(TyObject *op, TyObject *Ty_UNUSED(ignored)) +picklebuf_raw(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyPickleBufferObject *self = (PyPickleBufferObject*)op; if (self->view.obj == NULL) { @@ -190,11 +190,11 @@ Return a memoryview of the raw memory underlying this buffer.\n\ Will raise BufferError is the buffer isn't contiguous."); static TyObject * -picklebuf_release(TyObject *op, TyObject *Ty_UNUSED(ignored)) +picklebuf_release(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyPickleBufferObject *self = (PyPickleBufferObject*)op; PyBuffer_Release(&self->view); - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(picklebuf_release_doc, diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 855b5af..0b30fea 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -255,7 +255,7 @@ compute_range_length(TyObject *start, TyObject *stop, TyObject *step) } assert(len == -2); - cmp_result = PyObject_RichCompareBool(step, zero, Ty_GT); + cmp_result = PyObject_RichCompareBool(step, zero, Py_GT); if (cmp_result == -1) return NULL; @@ -272,7 +272,7 @@ compute_range_length(TyObject *start, TyObject *stop, TyObject *step) } /* if (lo >= hi), return length of 0. */ - cmp_result = PyObject_RichCompareBool(lo, hi, Ty_GE); + cmp_result = PyObject_RichCompareBool(lo, hi, Py_GE); if (cmp_result != 0) { Ty_DECREF(step); if (cmp_result < 0) @@ -349,7 +349,7 @@ compute_range_item(rangeobject *r, TyObject *arg) * i = arg * } */ - cmp_result = PyObject_RichCompareBool(arg, zero, Ty_LT); + cmp_result = PyObject_RichCompareBool(arg, zero, Py_LT); if (cmp_result == -1) { return NULL; } @@ -367,9 +367,9 @@ compute_range_item(rangeobject *r, TyObject *arg) * * } */ - cmp_result = PyObject_RichCompareBool(i, zero, Ty_LT); + cmp_result = PyObject_RichCompareBool(i, zero, Py_LT); if (cmp_result == 0) { - cmp_result = PyObject_RichCompareBool(i, r->length, Ty_GE); + cmp_result = PyObject_RichCompareBool(i, r->length, Py_GE); } if (cmp_result == -1) { Ty_DECREF(i); @@ -451,16 +451,16 @@ range_contains_long(rangeobject *r, TyObject *ob) /* Check if the value can possibly be in the range. */ - cmp1 = PyObject_RichCompareBool(r->step, zero, Ty_GT); + cmp1 = PyObject_RichCompareBool(r->step, zero, Py_GT); if (cmp1 == -1) goto end; if (cmp1 == 1) { /* positive steps: start <= ob < stop */ - cmp2 = PyObject_RichCompareBool(r->start, ob, Ty_LE); - cmp3 = PyObject_RichCompareBool(ob, r->stop, Ty_LT); + cmp2 = PyObject_RichCompareBool(r->start, ob, Py_LE); + cmp3 = PyObject_RichCompareBool(ob, r->stop, Py_LT); } else { /* negative steps: stop < ob <= start */ - cmp2 = PyObject_RichCompareBool(ob, r->start, Ty_LE); - cmp3 = PyObject_RichCompareBool(r->stop, ob, Ty_LT); + cmp2 = PyObject_RichCompareBool(ob, r->start, Py_LE); + cmp3 = PyObject_RichCompareBool(r->stop, ob, Py_LT); } if (cmp2 == -1 || cmp3 == -1) /* TypeError */ @@ -478,7 +478,7 @@ range_contains_long(rangeobject *r, TyObject *ob) if (tmp2 == NULL) goto end; /* result = ((int(ob) - start) % step) == 0 */ - result = PyObject_RichCompareBool(tmp2, zero, Ty_EQ); + result = PyObject_RichCompareBool(tmp2, zero, Py_EQ); end: Ty_XDECREF(tmp1); Ty_XDECREF(tmp2); @@ -518,7 +518,7 @@ range_equals(rangeobject *r0, rangeobject *r1) if (r0 == r1) return 1; - cmp_result = PyObject_RichCompareBool(r0->length, r1->length, Ty_EQ); + cmp_result = PyObject_RichCompareBool(r0->length, r1->length, Py_EQ); /* Return False or error to the caller. */ if (cmp_result != 1) return cmp_result; @@ -526,15 +526,15 @@ range_equals(rangeobject *r0, rangeobject *r1) /* Return True or error to the caller. */ if (cmp_result != 0) return cmp_result; - cmp_result = PyObject_RichCompareBool(r0->start, r1->start, Ty_EQ); + cmp_result = PyObject_RichCompareBool(r0->start, r1->start, Py_EQ); /* Return False or error to the caller. */ if (cmp_result != 1) return cmp_result; - cmp_result = PyObject_RichCompareBool(r0->length, _TyLong_GetOne(), Ty_EQ); + cmp_result = PyObject_RichCompareBool(r0->length, _TyLong_GetOne(), Py_EQ); /* Return True or error to the caller. */ if (cmp_result != 0) return cmp_result; - return PyObject_RichCompareBool(r0->step, r1->step, Ty_EQ); + return PyObject_RichCompareBool(r0->step, r1->step, Py_EQ); } static TyObject * @@ -543,24 +543,24 @@ range_richcompare(TyObject *self, TyObject *other, int op) int result; if (!TyRange_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; switch (op) { - case Ty_NE: - case Ty_EQ: + case Py_NE: + case Py_EQ: result = range_equals((rangeobject*)self, (rangeobject*)other); if (result == -1) return NULL; - if (op == Ty_NE) + if (op == Py_NE) result = !result; if (result) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; else - Ty_RETURN_FALSE; - case Ty_LE: - case Ty_GE: - case Ty_LT: - case Ty_GT: - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_FALSE; + case Py_LE: + case Py_GE: + case Py_LT: + case Py_GT: + Py_RETURN_NOTIMPLEMENTED; default: TyErr_BadArgument(); return NULL; @@ -596,7 +596,7 @@ range_hash(TyObject *op) } else { TyTuple_SET_ITEM(t, 1, Ty_NewRef(r->start)); - cmp_result = PyObject_RichCompareBool(r->length, _TyLong_GetOne(), Ty_EQ); + cmp_result = PyObject_RichCompareBool(r->length, _TyLong_GetOne(), Py_EQ); if (cmp_result == -1) goto end; if (cmp_result == 1) { @@ -751,7 +751,7 @@ static PyNumberMethods range_as_number = { }; static TyObject * range_iter(TyObject *seq); -static TyObject * range_reverse(TyObject *seq, TyObject *Ty_UNUSED(ignored)); +static TyObject * range_reverse(TyObject *seq, TyObject *Py_UNUSED(ignored)); PyDoc_STRVAR(reverse_doc, "Return a reverse iterator."); @@ -772,9 +772,9 @@ static TyMethodDef range_methods[] = { }; static TyMemberDef range_members[] = { - {"start", Ty_T_OBJECT_EX, offsetof(rangeobject, start), Ty_READONLY}, - {"stop", Ty_T_OBJECT_EX, offsetof(rangeobject, stop), Ty_READONLY}, - {"step", Ty_T_OBJECT_EX, offsetof(rangeobject, step), Ty_READONLY}, + {"start", Ty_T_OBJECT_EX, offsetof(rangeobject, start), Py_READONLY}, + {"stop", Ty_T_OBJECT_EX, offsetof(rangeobject, stop), Py_READONLY}, + {"step", Ty_T_OBJECT_EX, offsetof(rangeobject, step), Py_READONLY}, {0} }; @@ -841,7 +841,7 @@ rangeiter_next(TyObject *op) } static TyObject * -rangeiter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) +rangeiter_len(TyObject *op, TyObject *Py_UNUSED(ignored)) { _PyRangeIterObject *r = (_PyRangeIterObject*)op; return TyLong_FromLong(r->len); @@ -851,7 +851,7 @@ PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -rangeiter_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +rangeiter_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { _PyRangeIterObject *r = (_PyRangeIterObject*)op; TyObject *start=NULL, *stop=NULL, *step=NULL; @@ -895,7 +895,7 @@ rangeiter_setstate(TyObject *op, TyObject *state) index = r->len; /* exhausted iterator */ r->start += index * r->step; r->len -= index; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static void @@ -1003,7 +1003,7 @@ typedef struct { } longrangeiterobject; static TyObject * -longrangeiter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) +longrangeiter_len(TyObject *op, TyObject *Py_UNUSED(ignored)) { longrangeiterobject *r = (longrangeiterobject*)op; Ty_INCREF(r->len); @@ -1011,7 +1011,7 @@ longrangeiter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) } static TyObject * -longrangeiter_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +longrangeiter_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { longrangeiterobject *r = (longrangeiterobject*)op; TyObject *product, *stop=NULL; @@ -1047,14 +1047,14 @@ longrangeiter_setstate(TyObject *op, TyObject *state) int cmp; /* clip the value */ - cmp = PyObject_RichCompareBool(state, zero, Ty_LT); + cmp = PyObject_RichCompareBool(state, zero, Py_LT); if (cmp < 0) return NULL; if (cmp > 0) { state = zero; } else { - cmp = PyObject_RichCompareBool(r->len, state, Ty_LT); + cmp = PyObject_RichCompareBool(r->len, state, Py_LT); if (cmp < 0) return NULL; if (cmp > 0) @@ -1076,7 +1076,7 @@ longrangeiter_setstate(TyObject *op, TyObject *state) r->start = new_start; Ty_SETREF(r->len, new_len); Ty_DECREF(tmp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef longrangeiter_methods[] = { @@ -1100,7 +1100,7 @@ static TyObject * longrangeiter_next(TyObject *op) { longrangeiterobject *r = (longrangeiterobject*)op; - if (PyObject_RichCompareBool(r->len, _TyLong_GetZero(), Ty_GT) != 1) + if (PyObject_RichCompareBool(r->len, _TyLong_GetZero(), Py_GT) != 1) return NULL; TyObject *new_start = PyNumber_Add(r->start, r->step); @@ -1207,7 +1207,7 @@ range_iter(TyObject *seq) } static TyObject * -range_reverse(TyObject *seq, TyObject *Ty_UNUSED(ignored)) +range_reverse(TyObject *seq, TyObject *Py_UNUSED(ignored)) { rangeobject *range = (rangeobject*) seq; longrangeiterobject *it; diff --git a/Objects/setobject.c b/Objects/setobject.c index cd25c29..5c980bb 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -103,7 +103,7 @@ set_lookkey(PySetObject *so, TyObject *key, Ty_hash_t hash) return entry; table = so->table; Ty_INCREF(startkey); - cmp = PyObject_RichCompareBool(startkey, key, Ty_EQ); + cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Ty_DECREF(startkey); if (cmp < 0) return NULL; @@ -158,7 +158,7 @@ set_add_entry_takeref(PySetObject *so, TyObject *key, Ty_hash_t hash) goto found_active; table = so->table; Ty_INCREF(startkey); - cmp = PyObject_RichCompareBool(startkey, key, Ty_EQ); + cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Ty_DECREF(startkey); if (cmp > 0) goto found_active; @@ -849,7 +849,7 @@ setiter_traverse(TyObject *self, visitproc visit, void *arg) } static TyObject * -setiter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) +setiter_len(TyObject *op, TyObject *Py_UNUSED(ignored)) { setiterobject *si = (setiterobject*)op; Ty_ssize_t len = 0; @@ -861,7 +861,7 @@ setiter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -setiter_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +setiter_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { setiterobject *si = (setiterobject*)op; @@ -1116,7 +1116,7 @@ set_update_impl(PySetObject *so, TyObject * const *others, if (set_update_internal(so, other)) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* XXX Todo: @@ -1325,7 +1325,7 @@ set_clear_impl(PySetObject *so) /*[clinic end generated code: output=4e71d5a83904161a input=c6f831b366111950]*/ { set_clear_internal((TyObject*)so); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1367,7 +1367,7 @@ set_or(TyObject *self, TyObject *other) PySetObject *result; if (!PyAnySet_Check(self) || !PyAnySet_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; result = (PySetObject *)set_copy(self, NULL); if (result == NULL) { @@ -1387,7 +1387,7 @@ static TyObject * set_ior(TyObject *self, TyObject *other) { if (!PyAnySet_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; PySetObject *so = _TySet_CAST(self); if (set_update_internal(so, other)) { @@ -1524,7 +1524,7 @@ set_intersection_update(PySetObject *so, TyObject *other) return NULL; set_swap_bodies(so, (PySetObject *)tmp); Ty_DECREF(tmp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1549,14 +1549,14 @@ set_intersection_update_multi_impl(PySetObject *so, TyObject * const *others, set_swap_bodies(so, (PySetObject *)tmp); Ty_END_CRITICAL_SECTION(); Ty_DECREF(tmp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * set_and(TyObject *self, TyObject *other) { if (!PyAnySet_Check(self) || !PyAnySet_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; PySetObject *so = _TySet_CAST(self); TyObject *rv; @@ -1573,7 +1573,7 @@ set_iand(TyObject *self, TyObject *other) TyObject *result; if (!PyAnySet_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; PySetObject *so = _TySet_CAST(self); Ty_BEGIN_CRITICAL_SECTION2(so, other); @@ -1605,9 +1605,9 @@ set_isdisjoint_impl(PySetObject *so, TyObject *other) if ((TyObject *)so == other) { if (TySet_GET_SIZE(so) == 0) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; else - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } if (PyAnySet_CheckExact(other)) { @@ -1628,10 +1628,10 @@ set_isdisjoint_impl(PySetObject *so, TyObject *other) return NULL; } if (rv) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } it = PyObject_GetIter(other); @@ -1647,13 +1647,13 @@ set_isdisjoint_impl(PySetObject *so, TyObject *other) } if (rv) { Ty_DECREF(it); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } Ty_DECREF(it); if (TyErr_Occurred()) return NULL; - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } static int @@ -1742,7 +1742,7 @@ set_difference_update_impl(PySetObject *so, TyObject * const *others, return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -1880,7 +1880,7 @@ static TyObject * set_sub(TyObject *self, TyObject *other) { if (!PyAnySet_Check(self) || !PyAnySet_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; PySetObject *so = _TySet_CAST(self); TyObject *rv; @@ -1894,7 +1894,7 @@ static TyObject * set_isub(TyObject *self, TyObject *other) { if (!PyAnySet_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; PySetObject *so = _TySet_CAST(self); int rv; @@ -2004,7 +2004,7 @@ set_symmetric_difference_update_impl(PySetObject *so, TyObject *other) if (rv < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2040,7 +2040,7 @@ static TyObject * set_xor(TyObject *self, TyObject *other) { if (!PyAnySet_Check(self) || !PyAnySet_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; PySetObject *so = _TySet_CAST(self); return set_symmetric_difference((TyObject*)so, other); } @@ -2051,7 +2051,7 @@ set_ixor(TyObject *self, TyObject *other) TyObject *result; if (!PyAnySet_Check(other)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; PySetObject *so = _TySet_CAST(self); result = set_symmetric_difference_update((TyObject*)so, other); @@ -2089,7 +2089,7 @@ set_issubset_impl(PySetObject *so, TyObject *other) return TyBool_FromLong(result); } if (TySet_GET_SIZE(so) > TySet_GET_SIZE(other)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; while (set_next(so, &pos, &entry)) { TyObject *key = entry->key; @@ -2100,10 +2100,10 @@ set_issubset_impl(PySetObject *so, TyObject *other) return NULL; } if (!rv) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -2137,14 +2137,14 @@ set_issuperset_impl(PySetObject *so, TyObject *other) } if (!rv) { Ty_DECREF(it); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } Ty_DECREF(it); if (TyErr_Occurred()) { return NULL; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } static TyObject * @@ -2155,19 +2155,19 @@ set_richcompare(TyObject *self, TyObject *w, int op) int r2; if(!PyAnySet_Check(w)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; switch (op) { - case Ty_EQ: + case Py_EQ: if (TySet_GET_SIZE(v) != TySet_GET_SIZE(w)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; Ty_hash_t v_hash = FT_ATOMIC_LOAD_SSIZE_RELAXED(v->hash); Ty_hash_t w_hash = FT_ATOMIC_LOAD_SSIZE_RELAXED(((PySetObject *)w)->hash); if (v_hash != -1 && w_hash != -1 && v_hash != w_hash) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; return set_issubset((TyObject*)v, w); - case Ty_NE: - r1 = set_richcompare((TyObject*)v, w, Ty_EQ); + case Py_NE: + r1 = set_richcompare((TyObject*)v, w, Py_EQ); if (r1 == NULL) return NULL; r2 = PyObject_IsTrue(r1); @@ -2175,20 +2175,20 @@ set_richcompare(TyObject *self, TyObject *w, int op) if (r2 < 0) return NULL; return TyBool_FromLong(!r2); - case Ty_LE: + case Py_LE: return set_issubset((TyObject*)v, w); - case Ty_GE: + case Py_GE: return set_issuperset((TyObject*)v, w); - case Ty_LT: + case Py_LT: if (TySet_GET_SIZE(v) >= TySet_GET_SIZE(w)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; return set_issubset((TyObject*)v, w); - case Ty_GT: + case Py_GT: if (TySet_GET_SIZE(v) <= TySet_GET_SIZE(w)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; return set_issuperset((TyObject*)v, w); } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } /*[clinic input] @@ -2209,7 +2209,7 @@ set_add_impl(PySetObject *so, TyObject *key) { if (set_add_key(so, key)) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int @@ -2329,7 +2329,7 @@ set_remove_impl(PySetObject *so, TyObject *key) _TyErr_SetKeyError(key); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2364,7 +2364,7 @@ set_discard_impl(PySetObject *so, TyObject *key) if (rv < 0) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c index 60632c9..16944dd 100644 --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -21,7 +21,7 @@ this type and there is exactly one in existence. #include "pycore_object.h" // _TyObject_GC_TRACK() -#define _PySlice_CAST(op) _Ty_CAST(PySliceObject*, (op)) +#define _PySlice_CAST(op) _Py_CAST(PySliceObject*, (op)) static TyObject * @@ -51,7 +51,7 @@ ellipsis_repr(TyObject *op) } static TyObject * -ellipsis_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +ellipsis_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { return TyUnicode_FromString("Ellipsis"); } @@ -363,9 +363,9 @@ slice_repr(TyObject *op) } static TyMemberDef slice_members[] = { - {"start", _Ty_T_OBJECT, offsetof(PySliceObject, start), Ty_READONLY}, - {"stop", _Ty_T_OBJECT, offsetof(PySliceObject, stop), Ty_READONLY}, - {"step", _Ty_T_OBJECT, offsetof(PySliceObject, step), Ty_READONLY}, + {"start", _Ty_T_OBJECT, offsetof(PySliceObject, start), Py_READONLY}, + {"stop", _Ty_T_OBJECT, offsetof(PySliceObject, stop), Py_READONLY}, + {"step", _Ty_T_OBJECT, offsetof(PySliceObject, step), Py_READONLY}, {0} }; @@ -452,7 +452,7 @@ _PySlice_GetLongIndices(PySliceObject *self, TyObject *length, if (start == NULL) goto error; - cmp_result = PyObject_RichCompareBool(start, lower, Ty_LT); + cmp_result = PyObject_RichCompareBool(start, lower, Py_LT); if (cmp_result < 0) goto error; if (cmp_result) { @@ -460,7 +460,7 @@ _PySlice_GetLongIndices(PySliceObject *self, TyObject *length, } } else { - cmp_result = PyObject_RichCompareBool(start, upper, Ty_GT); + cmp_result = PyObject_RichCompareBool(start, upper, Py_GT); if (cmp_result < 0) goto error; if (cmp_result) { @@ -485,7 +485,7 @@ _PySlice_GetLongIndices(PySliceObject *self, TyObject *length, if (stop == NULL) goto error; - cmp_result = PyObject_RichCompareBool(stop, lower, Ty_LT); + cmp_result = PyObject_RichCompareBool(stop, lower, Py_LT); if (cmp_result < 0) goto error; if (cmp_result) { @@ -493,7 +493,7 @@ _PySlice_GetLongIndices(PySliceObject *self, TyObject *length, } } else { - cmp_result = PyObject_RichCompareBool(stop, upper, Ty_GT); + cmp_result = PyObject_RichCompareBool(stop, upper, Py_GT); if (cmp_result < 0) goto error; if (cmp_result) { @@ -558,7 +558,7 @@ S. Out of bounds indices are clipped in a manner consistent with the\n\ handling of normal slices."); static TyObject * -slice_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +slice_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { PySliceObject *self = _PySlice_CAST(op); return Ty_BuildValue("O(OOO)", Ty_TYPE(self), self->start, self->stop, self->step); @@ -576,16 +576,16 @@ static TyObject * slice_richcompare(TyObject *v, TyObject *w, int op) { if (!TySlice_Check(v) || !TySlice_Check(w)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; if (v == w) { TyObject *res; /* XXX Do we really need this shortcut? There's a unit test for it, but is that fair? */ switch (op) { - case Ty_EQ: - case Ty_LE: - case Ty_GE: + case Py_EQ: + case Py_LE: + case Py_GE: res = Ty_True; break; default: diff --git a/Objects/stringlib/ctype.h b/Objects/stringlib/ctype.h index 2c6ecf3..aab4b62 100644 --- a/Objects/stringlib/ctype.h +++ b/Objects/stringlib/ctype.h @@ -5,49 +5,49 @@ #include "pycore_bytes_methods.h" static TyObject* -stringlib_isspace(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_isspace(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _Ty_bytes_isspace(STRINGLIB_STR(self), STRINGLIB_LEN(self)); } static TyObject* -stringlib_isalpha(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_isalpha(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _Ty_bytes_isalpha(STRINGLIB_STR(self), STRINGLIB_LEN(self)); } static TyObject* -stringlib_isalnum(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_isalnum(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _Ty_bytes_isalnum(STRINGLIB_STR(self), STRINGLIB_LEN(self)); } static TyObject* -stringlib_isascii(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_isascii(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _Ty_bytes_isascii(STRINGLIB_STR(self), STRINGLIB_LEN(self)); } static TyObject* -stringlib_isdigit(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_isdigit(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _Ty_bytes_isdigit(STRINGLIB_STR(self), STRINGLIB_LEN(self)); } static TyObject* -stringlib_islower(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_islower(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _Ty_bytes_islower(STRINGLIB_STR(self), STRINGLIB_LEN(self)); } static TyObject* -stringlib_isupper(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_isupper(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _Ty_bytes_isupper(STRINGLIB_STR(self), STRINGLIB_LEN(self)); } static TyObject* -stringlib_istitle(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_istitle(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _Ty_bytes_istitle(STRINGLIB_STR(self), STRINGLIB_LEN(self)); } @@ -56,7 +56,7 @@ stringlib_istitle(TyObject *self, TyObject *Ty_UNUSED(ignored)) /* functions that return a new object partially translated by ctype funcs: */ static TyObject* -stringlib_lower(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_lower(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject* newobj; newobj = STRINGLIB_NEW(NULL, STRINGLIB_LEN(self)); @@ -68,7 +68,7 @@ stringlib_lower(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject* -stringlib_upper(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_upper(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject* newobj; newobj = STRINGLIB_NEW(NULL, STRINGLIB_LEN(self)); @@ -80,7 +80,7 @@ stringlib_upper(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject* -stringlib_title(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_title(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject* newobj; newobj = STRINGLIB_NEW(NULL, STRINGLIB_LEN(self)); @@ -92,7 +92,7 @@ stringlib_title(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject* -stringlib_capitalize(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_capitalize(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject* newobj; newobj = STRINGLIB_NEW(NULL, STRINGLIB_LEN(self)); @@ -104,7 +104,7 @@ stringlib_capitalize(TyObject *self, TyObject *Ty_UNUSED(ignored)) } static TyObject* -stringlib_swapcase(TyObject *self, TyObject *Ty_UNUSED(ignored)) +stringlib_swapcase(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject* newobj; newobj = STRINGLIB_NEW(NULL, STRINGLIB_LEN(self)); diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h index b368a7a..caeebad 100644 --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@ -64,7 +64,7 @@ Ty_LOCAL_INLINE(TyObject *) SubString_new_object(SubString *str) { if (str->str == NULL) - Ty_RETURN_NONE; + Py_RETURN_NONE; return TyUnicode_Substring(str->str, str->start, str->end); } @@ -1100,7 +1100,7 @@ static TyTypeObject PyFormatterIter_Type = { describing the parsed elements. It's a wrapper around stringlib/string_format.h's MarkupIterator */ static TyObject * -formatter_parser(TyObject *Ty_UNUSED(module), TyObject *self) +formatter_parser(TyObject *Py_UNUSED(module), TyObject *self) { formatteriterobject *it; @@ -1236,7 +1236,7 @@ static TyTypeObject PyFieldNameIter_Type = { field_name_split. The iterator it returns is a FieldNameIterator */ static TyObject * -formatter_field_name_split(TyObject *Ty_UNUSED(module), TyObject *self) +formatter_field_name_split(TyObject *Py_UNUSED(module), TyObject *self) { SubString first; Ty_ssize_t first_idx; diff --git a/Objects/structseq.c b/Objects/structseq.c index b8b1d6a..4b36762 100644 --- a/Objects/structseq.c +++ b/Objects/structseq.c @@ -336,7 +336,7 @@ error: static TyObject * -structseq_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +structseq_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { PyStructSequence *self = (PyStructSequence*)op; TyObject* tup = NULL; @@ -554,7 +554,7 @@ initialize_members(PyStructSequence_Desc *desc, members[k].type = _Ty_T_OBJECT; members[k].offset = offsetof(PyStructSequence, ob_item) + i * sizeof(TyObject*); - members[k].flags = Ty_READONLY; + members[k].flags = Py_READONLY; members[k].doc = desc->fields[i].doc; k++; } diff --git a/Objects/templateobject.c b/Objects/templateobject.c index ea47399..4d3ff5a 100644 --- a/Objects/templateobject.c +++ b/Objects/templateobject.c @@ -13,7 +13,7 @@ typedef struct { } templateiterobject; #define templateiterobject_CAST(op) \ - (assert(_PyTemplateIter_CheckExact(op)), _Ty_CAST(templateiterobject*, (op))) + (assert(_PyTemplateIter_CheckExact(op)), _Py_CAST(templateiterobject*, (op))) static TyObject * templateiter_next(TyObject *op) @@ -87,7 +87,7 @@ typedef struct { } templateobject; #define templateobject_CAST(op) \ - (assert(_PyTemplate_CheckExact(op)), _Ty_CAST(templateobject*, (op))) + (assert(_PyTemplate_CheckExact(op)), _Py_CAST(templateobject*, (op))) static TyObject * template_new(TyTypeObject *type, TyObject *args, TyObject *kwds) @@ -311,7 +311,7 @@ _PyTemplate_Concat(TyObject *self, TyObject *other) } static TyObject * -template_values_get(TyObject *op, void *Ty_UNUSED(data)) +template_values_get(TyObject *op, void *Py_UNUSED(data)) { templateobject *self = templateobject_CAST(op); @@ -330,8 +330,8 @@ template_values_get(TyObject *op, void *Ty_UNUSED(data)) } static TyMemberDef template_members[] = { - {"strings", Ty_T_OBJECT_EX, offsetof(templateobject, strings), Ty_READONLY, "Strings"}, - {"interpolations", Ty_T_OBJECT_EX, offsetof(templateobject, interpolations), Ty_READONLY, "Interpolations"}, + {"strings", Ty_T_OBJECT_EX, offsetof(templateobject, strings), Py_READONLY, "Strings"}, + {"interpolations", Ty_T_OBJECT_EX, offsetof(templateobject, interpolations), Py_READONLY, "Interpolations"}, {NULL}, }; @@ -346,7 +346,7 @@ static PySequenceMethods template_as_sequence = { }; static TyObject* -template_reduce(TyObject *op, TyObject *Ty_UNUSED(dummy)) +template_reduce(TyObject *op, TyObject *Py_UNUSED(dummy)) { TyObject *mod = TyImport_ImportModule("string.templatelib"); if (mod == NULL) { diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index f8c5547..048bc89 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -349,7 +349,7 @@ tuple_contains(TyObject *self, TyObject *el) PyTupleObject *a = _TyTuple_CAST(self); int cmp = 0; for (Ty_ssize_t i = 0; cmp == 0 && i < Ty_SIZE(a); ++i) { - cmp = PyObject_RichCompareBool(TyTuple_GET_ITEM(a, i), el, Ty_EQ); + cmp = PyObject_RichCompareBool(TyTuple_GET_ITEM(a, i), el, Py_EQ); } return cmp; } @@ -579,7 +579,7 @@ tuple_index_impl(PyTupleObject *self, TyObject *value, Ty_ssize_t start, stop = Ty_SIZE(self); } for (i = start; i < stop; i++) { - int cmp = PyObject_RichCompareBool(self->ob_item[i], value, Ty_EQ); + int cmp = PyObject_RichCompareBool(self->ob_item[i], value, Py_EQ); if (cmp > 0) return TyLong_FromSsize_t(i); else if (cmp < 0) @@ -606,7 +606,7 @@ tuple_count_impl(PyTupleObject *self, TyObject *value) Ty_ssize_t i; for (i = 0; i < Ty_SIZE(self); i++) { - int cmp = PyObject_RichCompareBool(self->ob_item[i], value, Ty_EQ); + int cmp = PyObject_RichCompareBool(self->ob_item[i], value, Py_EQ); if (cmp > 0) count++; else if (cmp < 0) @@ -633,7 +633,7 @@ tuple_richcompare(TyObject *v, TyObject *w, int op) Ty_ssize_t vlen, wlen; if (!TyTuple_Check(v) || !TyTuple_Check(w)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; vt = (PyTupleObject *)v; wt = (PyTupleObject *)w; @@ -654,7 +654,7 @@ tuple_richcompare(TyObject *v, TyObject *w, int op) */ for (i = 0; i < vlen && i < wlen; i++) { int k = PyObject_RichCompareBool(vt->ob_item[i], - wt->ob_item[i], Ty_EQ); + wt->ob_item[i], Py_EQ); if (k < 0) return NULL; if (!k) @@ -663,15 +663,15 @@ tuple_richcompare(TyObject *v, TyObject *w, int op) if (i >= vlen || i >= wlen) { /* No more items to compare -- compare sizes */ - Ty_RETURN_RICHCOMPARE(vlen, wlen, op); + Py_RETURN_RICHCOMPARE(vlen, wlen, op); } /* We have an item that differs -- shortcuts for EQ/NE */ - if (op == Ty_EQ) { - Ty_RETURN_FALSE; + if (op == Py_EQ) { + Py_RETURN_FALSE; } - if (op == Ty_NE) { - Ty_RETURN_TRUE; + if (op == Py_NE) { + Py_RETURN_TRUE; } /* Compare the final item again using the proper operator */ @@ -1032,7 +1032,7 @@ tupleiter_next(TyObject *self) } static TyObject * -tupleiter_len(TyObject *self, TyObject *Ty_UNUSED(ignored)) +tupleiter_len(TyObject *self, TyObject *Py_UNUSED(ignored)) { _PyTupleIterObject *it = _PyTupleIterObject_CAST(self); Ty_ssize_t len = 0; @@ -1051,7 +1051,7 @@ tupleiter_len(TyObject *self, TyObject *Ty_UNUSED(ignored)) PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -tupleiter_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +tupleiter_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *iter = _TyEval_GetBuiltin(&_Ty_ID(iter)); @@ -1085,7 +1085,7 @@ tupleiter_setstate(TyObject *self, TyObject *state) index = TyTuple_GET_SIZE(it->it_seq); /* exhausted iterator */ FT_ATOMIC_STORE_SSIZE_RELAXED(it->it_index, index); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(reduce_doc, "Return state information for pickling."); diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 7e0aaf4..33f79ad 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -808,7 +808,7 @@ _TyType_GetDocFromInternalDoc(const char *name, const char *internal_doc) const char *doc = _TyType_DocWithoutSignature(name, internal_doc); if (!doc || *doc == '\0') { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyUnicode_FromString(doc); @@ -850,7 +850,7 @@ _TyType_GetTextSignatureFromInternalDoc(const char *name, const char *internal_d if (start) { return TyUnicode_FromString(start); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* back "end" up until it points just past the final ')' */ @@ -1332,16 +1332,16 @@ int PyUnstable_Type_AssignVersionTag(TyTypeObject *type) static TyMemberDef type_members[] = { - {"__basicsize__", Ty_T_PYSSIZET, offsetof(TyTypeObject,tp_basicsize),Ty_READONLY}, - {"__itemsize__", Ty_T_PYSSIZET, offsetof(TyTypeObject, tp_itemsize), Ty_READONLY}, - {"__flags__", Ty_T_ULONG, offsetof(TyTypeObject, tp_flags), Ty_READONLY}, + {"__basicsize__", Ty_T_PYSSIZET, offsetof(TyTypeObject,tp_basicsize),Py_READONLY}, + {"__itemsize__", Ty_T_PYSSIZET, offsetof(TyTypeObject, tp_itemsize), Py_READONLY}, + {"__flags__", Ty_T_ULONG, offsetof(TyTypeObject, tp_flags), Py_READONLY}, /* Note that this value is misleading for static builtin types, since the memory at this offset will always be NULL. */ {"__weakrefoffset__", Ty_T_PYSSIZET, - offsetof(TyTypeObject, tp_weaklistoffset), Ty_READONLY}, - {"__base__", _Ty_T_OBJECT, offsetof(TyTypeObject, tp_base), Ty_READONLY}, + offsetof(TyTypeObject, tp_weaklistoffset), Py_READONLY}, + {"__base__", _Ty_T_OBJECT, offsetof(TyTypeObject, tp_base), Py_READONLY}, {"__dictoffset__", Ty_T_PYSSIZET, - offsetof(TyTypeObject, tp_dictoffset), Ty_READONLY}, + offsetof(TyTypeObject, tp_dictoffset), Py_READONLY}, {0} }; @@ -1384,7 +1384,7 @@ _TyType_Name(TyTypeObject *type) } static TyObject * -type_name(TyObject *tp, void *Ty_UNUSED(closure)) +type_name(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (type->tp_flags & Ty_TPFLAGS_HEAPTYPE) { @@ -1397,7 +1397,7 @@ type_name(TyObject *tp, void *Ty_UNUSED(closure)) } static TyObject * -type_qualname(TyObject *tp, void *Ty_UNUSED(closure)) +type_qualname(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (type->tp_flags & Ty_TPFLAGS_HEAPTYPE) { @@ -1410,7 +1410,7 @@ type_qualname(TyObject *tp, void *Ty_UNUSED(closure)) } static int -type_set_name(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) +type_set_name(TyObject *tp, TyObject *value, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); const char *tp_name; @@ -1488,14 +1488,14 @@ type_module(TyTypeObject *type) } static inline TyObject * -type_get_module(TyObject *tp, void *Ty_UNUSED(closure)) +type_get_module(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); return type_module(type); } static int -type_set_module(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) +type_set_module(TyObject *tp, TyObject *value, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (!check_set_special_type_attr(type, value, "__module__")) @@ -1551,7 +1551,7 @@ TyType_GetFullyQualifiedName(TyTypeObject *type) } static TyObject * -type_abstractmethods(TyObject *tp, void *Ty_UNUSED(closure)) +type_abstractmethods(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); TyObject *res = NULL; @@ -1570,7 +1570,7 @@ type_abstractmethods(TyObject *tp, void *Ty_UNUSED(closure)) } static int -type_set_abstractmethods(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) +type_set_abstractmethods(TyObject *tp, TyObject *value, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); /* __abstractmethods__ should only be set once on a type, in @@ -1609,18 +1609,18 @@ type_set_abstractmethods(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure) } static TyObject * -type_get_bases(TyObject *tp, void *Ty_UNUSED(closure)) +type_get_bases(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); TyObject *bases = _TyType_GetBases(type); if (bases == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return bases; } static TyObject * -type_get_mro(TyObject *tp, void *Ty_UNUSED(closure)) +type_get_mro(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); TyObject *mro; @@ -1858,7 +1858,7 @@ type_set_bases_unlocked(TyTypeObject *type, TyObject *new_bases) } static int -type_set_bases(TyObject *tp, TyObject *new_bases, void *Ty_UNUSED(closure)) +type_set_bases(TyObject *tp, TyObject *new_bases, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); int res; @@ -1869,18 +1869,18 @@ type_set_bases(TyObject *tp, TyObject *new_bases, void *Ty_UNUSED(closure)) } static TyObject * -type_dict(TyObject *tp, void *Ty_UNUSED(closure)) +type_dict(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); TyObject *dict = lookup_tp_dict(type); if (dict == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return PyDictProxy_New(dict); } static TyObject * -type_get_doc(TyObject *tp, void *Ty_UNUSED(closure)) +type_get_doc(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); TyObject *result; @@ -1901,14 +1901,14 @@ type_get_doc(TyObject *tp, void *Ty_UNUSED(closure)) } static TyObject * -type_get_text_signature(TyObject *tp, void *Ty_UNUSED(closure)) +type_get_text_signature(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); return _TyType_GetTextSignatureFromInternalDoc(type->tp_name, type->tp_doc, 0); } static int -type_set_doc(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) +type_set_doc(TyObject *tp, TyObject *value, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (!check_set_special_type_attr(type, value, "__doc__")) @@ -1919,7 +1919,7 @@ type_set_doc(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) } static TyObject * -type_get_annotate(TyObject *tp, void *Ty_UNUSED(closure)) +type_get_annotate(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (!(type->tp_flags & Ty_TPFLAGS_HEAPTYPE)) { @@ -1959,7 +1959,7 @@ type_get_annotate(TyObject *tp, void *Ty_UNUSED(closure)) } static int -type_set_annotate(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) +type_set_annotate(TyObject *tp, TyObject *value, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (value == NULL) { @@ -1998,7 +1998,7 @@ type_set_annotate(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) } static TyObject * -type_get_annotations(TyObject *tp, void *Ty_UNUSED(closure)) +type_get_annotations(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (!(type->tp_flags & Ty_TPFLAGS_HEAPTYPE)) { @@ -2068,7 +2068,7 @@ type_get_annotations(TyObject *tp, void *Ty_UNUSED(closure)) } static int -type_set_annotations(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) +type_set_annotations(TyObject *tp, TyObject *value, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (_TyType_HasFeature(type, Ty_TPFLAGS_IMMUTABLETYPE)) { @@ -2140,7 +2140,7 @@ type_set_annotations(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) } static TyObject * -type_get_type_params(TyObject *tp, void *Ty_UNUSED(closure)) +type_get_type_params(TyObject *tp, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (type == &TyType_Type) { @@ -2155,7 +2155,7 @@ type_get_type_params(TyObject *tp, void *Ty_UNUSED(closure)) } static int -type_set_type_params(TyObject *tp, TyObject *value, void *Ty_UNUSED(closure)) +type_set_type_params(TyObject *tp, TyObject *value, void *Py_UNUSED(closure)) { TyTypeObject *type = PyTypeObject_CAST(tp); if (!check_set_special_type_attr(type, value, "__type_params__")) { @@ -2497,7 +2497,7 @@ clear_slots(TyTypeObject *type, TyObject *self) n = Ty_SIZE(type); mp = _PyHeapType_GET_MEMBERS((PyHeapTypeObject *)type); for (i = 0; i < n; i++, mp++) { - if (mp->type == Ty_T_OBJECT_EX && !(mp->flags & Ty_READONLY)) { + if (mp->type == Ty_T_OBJECT_EX && !(mp->flags & Py_READONLY)) { char *addr = (char *)self + mp->offset; TyObject *obj = *(TyObject **)addr; if (obj != NULL) { @@ -2979,7 +2979,7 @@ vectorcall_maybe(PyThreadState *tstate, TyObject *name, if (func == NULL) { _TyThreadState_PopCStackRef(tstate, &cref); if (!TyErr_Occurred()) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } return NULL; } @@ -4897,17 +4897,17 @@ special_offset_from_member( memb->name); return -1; } - if (memb->flags == Ty_READONLY) { + if (memb->flags == Py_READONLY) { *dest = memb->offset; return 0; } - else if (memb->flags == (Ty_READONLY | Ty_RELATIVE_OFFSET)) { + else if (memb->flags == (Py_READONLY | Ty_RELATIVE_OFFSET)) { *dest = memb->offset + type_data_offset; return 0; } TyErr_Format( TyExc_SystemError, - "flags for %s must be Ty_READONLY or (Ty_READONLY | Ty_RELATIVE_OFFSET)", + "flags for %s must be Py_READONLY or (Py_READONLY | Ty_RELATIVE_OFFSET)", memb->name); return -1; } @@ -6860,21 +6860,21 @@ object_richcompare(TyObject *self, TyObject *other, int op) switch (op) { - case Ty_EQ: + case Py_EQ: /* Return NotImplemented instead of False, so if two objects are compared, both get a chance at the comparison. See issue #1393. */ res = Ty_NewRef((self == other) ? Ty_True : Ty_NotImplemented); break; - case Ty_NE: + case Py_NE: /* By default, __ne__() delegates to __eq__() and inverts the result, unless the latter returns NotImplemented. */ if (Ty_TYPE(self)->tp_richcompare == NULL) { res = Ty_NewRef(Ty_NotImplemented); break; } - res = (*Ty_TYPE(self)->tp_richcompare)(self, other, Ty_EQ); + res = (*Ty_TYPE(self)->tp_richcompare)(self, other, Py_EQ); if (res != NULL && res != Ty_NotImplemented) { int ok = PyObject_IsTrue(res); Ty_DECREF(res); @@ -6946,7 +6946,7 @@ same_slots_added(TyTypeObject *a, TyTypeObject *b) slots_a = ((PyHeapTypeObject *)a)->ht_slots; slots_b = ((PyHeapTypeObject *)b)->ht_slots; if (slots_a && slots_b) { - if (PyObject_RichCompareBool(slots_a, slots_b, Ty_EQ) != 1) + if (PyObject_RichCompareBool(slots_a, slots_b, Py_EQ) != 1) return 0; size += sizeof(TyObject *) * TyTuple_GET_SIZE(slots_a); } @@ -7718,7 +7718,7 @@ object___reduce_ex___impl(TyObject *self, int protocol) static TyObject * object_subclasshook(TyObject *cls, TyObject *args) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } PyDoc_STRVAR(object_subclasshook_doc, @@ -7732,7 +7732,7 @@ PyDoc_STRVAR(object_subclasshook_doc, static TyObject * object_init_subclass(TyObject *cls, TyObject *arg) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(object_init_subclass_doc, @@ -9329,7 +9329,7 @@ wrap_sq_setitem(TyObject *self, TyObject *args, void *wrapped) res = (*func)(self, i, value); if (res == -1 && TyErr_Occurred()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -9349,7 +9349,7 @@ wrap_sq_delitem(TyObject *self, TyObject *args, void *wrapped) res = (*func)(self, i, NULL); if (res == -1 && TyErr_Occurred()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* XXX objobjproc is a misnomer; should be objargpred */ @@ -9382,7 +9382,7 @@ wrap_objobjargproc(TyObject *self, TyObject *args, void *wrapped) res = (*func)(self, key, value); if (res == -1 && TyErr_Occurred()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -9398,7 +9398,7 @@ wrap_delitem(TyObject *self, TyObject *args, void *wrapped) res = (*func)(self, key, NULL); if (res == -1 && TyErr_Occurred()) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Helper to check for object.__setattr__ or __delattr__ applied to a type. @@ -9481,7 +9481,7 @@ wrap_setattr(TyObject *self, TyObject *args, void *wrapped) res = (*func)(self, name, value); if (res < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -9499,7 +9499,7 @@ wrap_delattr(TyObject *self, TyObject *args, void *wrapped) res = (*func)(self, name, NULL); if (res < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -9533,7 +9533,7 @@ wrap_del(TyObject *self, TyObject *args, void *wrapped) return NULL; (*func)(self); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -9556,12 +9556,12 @@ richcmp_##NAME(TyObject *self, TyObject *args, void *wrapped) \ return wrap_richcmpfunc(self, args, wrapped, OP); \ } -RICHCMP_WRAPPER(lt, Ty_LT) -RICHCMP_WRAPPER(le, Ty_LE) -RICHCMP_WRAPPER(eq, Ty_EQ) -RICHCMP_WRAPPER(ne, Ty_NE) -RICHCMP_WRAPPER(gt, Ty_GT) -RICHCMP_WRAPPER(ge, Ty_GE) +RICHCMP_WRAPPER(lt, Py_LT) +RICHCMP_WRAPPER(le, Py_LE) +RICHCMP_WRAPPER(eq, Py_EQ) +RICHCMP_WRAPPER(ne, Py_NE) +RICHCMP_WRAPPER(gt, Py_GT) +RICHCMP_WRAPPER(ge, Py_GE) static TyObject * wrap_next(TyObject *self, TyObject *args, void *wrapped) @@ -9610,7 +9610,7 @@ wrap_descr_set(TyObject *self, TyObject *args, void *wrapped) ret = (*func)(self, obj, value); if (ret < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -9626,7 +9626,7 @@ wrap_descr_delete(TyObject *self, TyObject *args, void *wrapped) ret = (*func)(self, obj, NULL); if (ret < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -9666,7 +9666,7 @@ wrap_releasebuffer(TyObject *self, TyObject *args, void *wrapped) PyMemoryViewObject *mview = (PyMemoryViewObject *)arg; if (mview->view.obj == NULL) { // Already released, ignore - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (mview->view.obj != self) { TyErr_SetString(TyExc_ValueError, @@ -9683,7 +9683,7 @@ wrap_releasebuffer(TyObject *self, TyObject *args, void *wrapped) return NULL; } Ty_DECREF(res); - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -9693,7 +9693,7 @@ wrap_init(TyObject *self, TyObject *args, void *wrapped, TyObject *kwds) if (func(self, args, kwds) < 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -9840,7 +9840,7 @@ method_is_overloaded(TyObject *left, TyObject *right, TyObject *name) return 1; } - ok = PyObject_RichCompareBool(a, b, Ty_NE); + ok = PyObject_RichCompareBool(a, b, Py_NE); Ty_DECREF(a); Ty_DECREF(b); return ok; @@ -9887,7 +9887,7 @@ FUNCNAME(TyObject *self, TyObject *other) \ stack[1] = self; \ return vectorcall_maybe(tstate, &_Ty_ID(RDUNDER), stack, 2); \ } \ - Ty_RETURN_NOTIMPLEMENTED; \ + Py_RETURN_NOTIMPLEMENTED; \ } #define SLOT1BIN(FUNCNAME, SLOTNAME, DUNDER, RDUNDER) \ @@ -10070,7 +10070,7 @@ slot_nb_power(TyObject *self, TyObject *other, TyObject *modulus) stack[2] = modulus; return vectorcall_maybe(tstate, &_Ty_ID(__rpow__), stack, 3); } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } SLOT0(slot_nb_negative, __neg__) @@ -10350,7 +10350,7 @@ slot_tp_richcompare(TyObject *self, TyObject *other, int op) if (TyErr_Occurred()) { return NULL; } - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } return res; } @@ -11673,11 +11673,11 @@ typedef struct { #define superobject_CAST(op) ((superobject *)(op)) static TyMemberDef super_members[] = { - {"__thisclass__", _Ty_T_OBJECT, offsetof(superobject, type), Ty_READONLY, + {"__thisclass__", _Ty_T_OBJECT, offsetof(superobject, type), Py_READONLY, "the class invoking super()"}, - {"__self__", _Ty_T_OBJECT, offsetof(superobject, obj), Ty_READONLY, + {"__self__", _Ty_T_OBJECT, offsetof(superobject, obj), Py_READONLY, "the instance invoking super(); may be None"}, - {"__self_class__", _Ty_T_OBJECT, offsetof(superobject, obj_type), Ty_READONLY, + {"__self_class__", _Ty_T_OBJECT, offsetof(superobject, obj_type), Py_READONLY, "the type of the instance invoking super(); may be None"}, {0} }; diff --git a/Objects/typevarobject.c b/Objects/typevarobject.c index cd229cc..336a36f 100644 --- a/Objects/typevarobject.c +++ b/Objects/typevarobject.c @@ -75,7 +75,7 @@ NoDefault_repr(TyObject *op) } static TyObject * -NoDefault_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +NoDefault_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { return TyUnicode_FromString("NoDefault"); } @@ -386,15 +386,15 @@ caller(void) { _PyInterpreterFrame *f = _TyThreadState_GET()->current_frame; if (f == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (f == NULL || PyStackRef_IsNull(f->f_funcobj)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *r = TyFunction_GetModule(PyStackRef_AsPyObjectBorrow(f->f_funcobj)); if (!r) { TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(r); } @@ -529,22 +529,22 @@ typevar_repr(TyObject *self) } static TyMemberDef typevar_members[] = { - {"__name__", _Ty_T_OBJECT, offsetof(typevarobject, name), Ty_READONLY}, - {"__covariant__", Ty_T_BOOL, offsetof(typevarobject, covariant), Ty_READONLY}, - {"__contravariant__", Ty_T_BOOL, offsetof(typevarobject, contravariant), Ty_READONLY}, - {"__infer_variance__", Ty_T_BOOL, offsetof(typevarobject, infer_variance), Ty_READONLY}, + {"__name__", _Ty_T_OBJECT, offsetof(typevarobject, name), Py_READONLY}, + {"__covariant__", Ty_T_BOOL, offsetof(typevarobject, covariant), Py_READONLY}, + {"__contravariant__", Ty_T_BOOL, offsetof(typevarobject, contravariant), Py_READONLY}, + {"__infer_variance__", Ty_T_BOOL, offsetof(typevarobject, infer_variance), Py_READONLY}, {0} }; static TyObject * -typevar_bound(TyObject *op, void *Ty_UNUSED(closure)) +typevar_bound(TyObject *op, void *Py_UNUSED(closure)) { typevarobject *self = typevarobject_CAST(op); if (self->bound != NULL) { return Ty_NewRef(self->bound); } if (self->evaluate_bound == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *bound = PyObject_CallNoArgs(self->evaluate_bound); self->bound = Ty_XNewRef(bound); @@ -552,7 +552,7 @@ typevar_bound(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -typevar_default(TyObject *op, void *Ty_UNUSED(closure)) +typevar_default(TyObject *op, void *Py_UNUSED(closure)) { typevarobject *self = typevarobject_CAST(op); if (self->default_value != NULL) { @@ -567,7 +567,7 @@ typevar_default(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -typevar_constraints(TyObject *op, void *Ty_UNUSED(closure)) +typevar_constraints(TyObject *op, void *Py_UNUSED(closure)) { typevarobject *self = typevarobject_CAST(op); if (self->constraints != NULL) { @@ -582,7 +582,7 @@ typevar_constraints(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -typevar_evaluate_bound(TyObject *op, void *Ty_UNUSED(closure)) +typevar_evaluate_bound(TyObject *op, void *Py_UNUSED(closure)) { typevarobject *self = typevarobject_CAST(op); if (self->evaluate_bound != NULL) { @@ -591,11 +591,11 @@ typevar_evaluate_bound(TyObject *op, void *Ty_UNUSED(closure)) if (self->bound != NULL) { return constevaluator_alloc(self->bound); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -typevar_evaluate_constraints(TyObject *op, void *Ty_UNUSED(closure)) +typevar_evaluate_constraints(TyObject *op, void *Py_UNUSED(closure)) { typevarobject *self = typevarobject_CAST(op); if (self->evaluate_constraints != NULL) { @@ -604,11 +604,11 @@ typevar_evaluate_constraints(TyObject *op, void *Ty_UNUSED(closure)) if (self->constraints != NULL) { return constevaluator_alloc(self->constraints); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -typevar_evaluate_default(TyObject *op, void *Ty_UNUSED(closure)) +typevar_evaluate_default(TyObject *op, void *Py_UNUSED(closure)) { typevarobject *self = typevarobject_CAST(op); if (self->evaluate_default != NULL) { @@ -617,7 +617,7 @@ typevar_evaluate_default(TyObject *op, void *Ty_UNUSED(closure)) if (self->default_value != NULL) { return constevaluator_alloc(self->default_value); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyGetSetDef typevar_getset[] = { @@ -843,9 +843,9 @@ typevar_has_default_impl(typevarobject *self) { if (self->evaluate_default != NULL || (self->default_value != &_Ty_NoDefaultStruct && self->default_value != NULL)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * @@ -976,10 +976,10 @@ static TyObject * paramspecattr_richcompare(TyObject *a, TyObject *b, int op) { if (!Ty_IS_TYPE(a, Ty_TYPE(b))) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } - if (op != Ty_EQ && op != Ty_NE) { - Ty_RETURN_NOTIMPLEMENTED; + if (op != Py_EQ && op != Py_NE) { + Py_RETURN_NOTIMPLEMENTED; } paramspecattrobject *lhs = paramspecattrobject_CAST(a); // may be unsafe paramspecattrobject *rhs = (paramspecattrobject *)b; // safe fast cast @@ -987,7 +987,7 @@ paramspecattr_richcompare(TyObject *a, TyObject *b, int op) } static TyMemberDef paramspecattr_members[] = { - {"__origin__", _Ty_T_OBJECT, offsetof(paramspecattrobject, __origin__), Ty_READONLY}, + {"__origin__", _Ty_T_OBJECT, offsetof(paramspecattrobject, __origin__), Py_READONLY}, {0} }; @@ -1219,30 +1219,30 @@ paramspec_repr(TyObject *self) } static TyMemberDef paramspec_members[] = { - {"__name__", _Ty_T_OBJECT, offsetof(paramspecobject, name), Ty_READONLY}, - {"__bound__", _Ty_T_OBJECT, offsetof(paramspecobject, bound), Ty_READONLY}, - {"__covariant__", Ty_T_BOOL, offsetof(paramspecobject, covariant), Ty_READONLY}, - {"__contravariant__", Ty_T_BOOL, offsetof(paramspecobject, contravariant), Ty_READONLY}, - {"__infer_variance__", Ty_T_BOOL, offsetof(paramspecobject, infer_variance), Ty_READONLY}, + {"__name__", _Ty_T_OBJECT, offsetof(paramspecobject, name), Py_READONLY}, + {"__bound__", _Ty_T_OBJECT, offsetof(paramspecobject, bound), Py_READONLY}, + {"__covariant__", Ty_T_BOOL, offsetof(paramspecobject, covariant), Py_READONLY}, + {"__contravariant__", Ty_T_BOOL, offsetof(paramspecobject, contravariant), Py_READONLY}, + {"__infer_variance__", Ty_T_BOOL, offsetof(paramspecobject, infer_variance), Py_READONLY}, {0} }; static TyObject * -paramspec_args(TyObject *self, void *Ty_UNUSED(closure)) +paramspec_args(TyObject *self, void *Py_UNUSED(closure)) { TyTypeObject *tp = _TyInterpreterState_GET()->cached_objects.paramspecargs_type; return (TyObject *)paramspecattr_new(tp, self); } static TyObject * -paramspec_kwargs(TyObject *self, void *Ty_UNUSED(closure)) +paramspec_kwargs(TyObject *self, void *Py_UNUSED(closure)) { TyTypeObject *tp = _TyInterpreterState_GET()->cached_objects.paramspeckwargs_type; return (TyObject *)paramspecattr_new(tp, self); } static TyObject * -paramspec_default(TyObject *op, void *Ty_UNUSED(closure)) +paramspec_default(TyObject *op, void *Py_UNUSED(closure)) { paramspecobject *self = paramspecobject_CAST(op); if (self->default_value != NULL) { @@ -1257,7 +1257,7 @@ paramspec_default(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -paramspec_evaluate_default(TyObject *op, void *Ty_UNUSED(closure)) +paramspec_evaluate_default(TyObject *op, void *Py_UNUSED(closure)) { paramspecobject *self = paramspecobject_CAST(op); if (self->evaluate_default != NULL) { @@ -1266,7 +1266,7 @@ paramspec_evaluate_default(TyObject *op, void *Ty_UNUSED(closure)) if (self->default_value != NULL) { return constevaluator_alloc(self->default_value); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyGetSetDef paramspec_getset[] = { @@ -1411,9 +1411,9 @@ paramspec_has_default_impl(paramspecobject *self) { if (self->evaluate_default != NULL || (self->default_value != &_Ty_NoDefaultStruct && self->default_value != NULL)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * @@ -1555,7 +1555,7 @@ typevartuple_repr(TyObject *self) } static TyMemberDef typevartuple_members[] = { - {"__name__", _Ty_T_OBJECT, offsetof(typevartupleobject, name), Ty_READONLY}, + {"__name__", _Ty_T_OBJECT, offsetof(typevartupleobject, name), Py_READONLY}, {0} }; @@ -1665,9 +1665,9 @@ typevartuple_has_default_impl(typevartupleobject *self) { if (self->evaluate_default != NULL || (self->default_value != &_Ty_NoDefaultStruct && self->default_value != NULL)) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static TyObject * @@ -1700,7 +1700,7 @@ typevartuple_clear(TyObject *self) } static TyObject * -typevartuple_default(TyObject *op, void *Ty_UNUSED(closure)) +typevartuple_default(TyObject *op, void *Py_UNUSED(closure)) { typevartupleobject *self = typevartupleobject_CAST(op); if (self->default_value != NULL) { @@ -1715,7 +1715,7 @@ typevartuple_default(TyObject *op, void *Ty_UNUSED(closure)) } static TyObject * -typevartuple_evaluate_default(TyObject *op, void *Ty_UNUSED(closure)) +typevartuple_evaluate_default(TyObject *op, void *Py_UNUSED(closure)) { typevartupleobject *self = typevartupleobject_CAST(op); if (self->evaluate_default != NULL) { @@ -1724,7 +1724,7 @@ typevartuple_evaluate_default(TyObject *op, void *Ty_UNUSED(closure)) if (self->default_value != NULL) { return constevaluator_alloc(self->default_value); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyGetSetDef typevartuple_getset[] = { @@ -1814,14 +1814,14 @@ _Ty_make_typevar(TyObject *name, TyObject *evaluate_bound, TyObject *evaluate_co } TyObject * -_Ty_make_paramspec(PyThreadState *Ty_UNUSED(ignored), TyObject *v) +_Ty_make_paramspec(PyThreadState *Py_UNUSED(ignored), TyObject *v) { assert(TyUnicode_Check(v)); return (TyObject *)paramspec_alloc(v, NULL, NULL, false, false, true, NULL); } TyObject * -_Ty_make_typevartuple(PyThreadState *Ty_UNUSED(ignored), TyObject *v) +_Ty_make_typevartuple(PyThreadState *Py_UNUSED(ignored), TyObject *v) { assert(TyUnicode_Check(v)); return (TyObject *)typevartuple_alloc(v, NULL, NULL); @@ -1882,19 +1882,19 @@ typealias_repr(TyObject *self) } static TyMemberDef typealias_members[] = { - {"__name__", _Ty_T_OBJECT, offsetof(typealiasobject, name), Ty_READONLY}, + {"__name__", _Ty_T_OBJECT, offsetof(typealiasobject, name), Py_READONLY}, {0} }; static TyObject * -typealias_value(TyObject *self, void *Ty_UNUSED(closure)) +typealias_value(TyObject *self, void *Py_UNUSED(closure)) { typealiasobject *ta = typealiasobject_CAST(self); return typealias_get_value(ta); } static TyObject * -typealias_evaluate_value(TyObject *self, void *Ty_UNUSED(closure)) +typealias_evaluate_value(TyObject *self, void *Py_UNUSED(closure)) { typealiasobject *ta = typealiasobject_CAST(self); if (ta->compute_value != NULL) { @@ -1905,7 +1905,7 @@ typealias_evaluate_value(TyObject *self, void *Ty_UNUSED(closure)) } static TyObject * -typealias_parameters(TyObject *self, void *Ty_UNUSED(closure)) +typealias_parameters(TyObject *self, void *Py_UNUSED(closure)) { typealiasobject *ta = typealiasobject_CAST(self); if (ta->type_params == NULL) { @@ -1915,7 +1915,7 @@ typealias_parameters(TyObject *self, void *Ty_UNUSED(closure)) } static TyObject * -typealias_type_params(TyObject *self, void *Ty_UNUSED(closure)) +typealias_type_params(TyObject *self, void *Py_UNUSED(closure)) { typealiasobject *ta = typealiasobject_CAST(self); if (ta->type_params == NULL) { @@ -1925,7 +1925,7 @@ typealias_type_params(TyObject *self, void *Ty_UNUSED(closure)) } static TyObject * -typealias_module(TyObject *self, void *Ty_UNUSED(closure)) +typealias_module(TyObject *self, void *Py_UNUSED(closure)) { typealiasobject *ta = typealiasobject_CAST(self); if (ta->module != NULL) { @@ -1940,7 +1940,7 @@ typealias_module(TyObject *self, void *Ty_UNUSED(closure)) return Ty_NewRef(mod); } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyGetSetDef typealias_getset[] = { diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index df38fda..c8a0c7d 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8854,13 +8854,13 @@ charmapencode_lookup(Ty_UCS4 c, TyObject *mapping, unsigned char *replace) Ty_DECREF(w); if (rc == 0) { /* No mapping found means: mapping is undefined. */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (x == NULL) { if (TyErr_ExceptionMatches(TyExc_LookupError)) { /* No mapping found means: mapping is undefined. */ TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } else return NULL; } @@ -11537,32 +11537,32 @@ TyUnicode_RichCompare(TyObject *left, TyObject *right, int op) int result; if (!TyUnicode_Check(left) || !TyUnicode_Check(right)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; if (left == right) { switch (op) { - case Ty_EQ: - case Ty_LE: - case Ty_GE: + case Py_EQ: + case Py_LE: + case Py_GE: /* a string is equal to itself */ - Ty_RETURN_TRUE; - case Ty_NE: - case Ty_LT: - case Ty_GT: - Ty_RETURN_FALSE; + Py_RETURN_TRUE; + case Py_NE: + case Py_LT: + case Py_GT: + Py_RETURN_FALSE; default: TyErr_BadArgument(); return NULL; } } - else if (op == Ty_EQ || op == Ty_NE) { + else if (op == Py_EQ || op == Py_NE) { result = unicode_eq(left, right); - result ^= (op == Ty_NE); + result ^= (op == Py_NE); return TyBool_FromLong(result); } else { result = unicode_compare(left, right); - Ty_RETURN_RICHCOMPARE(result, 0, op); + Py_RETURN_RICHCOMPARE(result, 0, op); } } @@ -12083,14 +12083,14 @@ unicode_islower_impl(TyObject *self) /* Special case for empty strings */ if (length == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; cased = 0; for (i = 0; i < length; i++) { const Ty_UCS4 ch = TyUnicode_READ(kind, data, i); if (Ty_UNICODE_ISUPPER(ch) || Ty_UNICODE_ISTITLE(ch)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; else if (!cased && Ty_UNICODE_ISLOWER(ch)) cased = 1; } @@ -12126,14 +12126,14 @@ unicode_isupper_impl(TyObject *self) /* Special case for empty strings */ if (length == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; cased = 0; for (i = 0; i < length; i++) { const Ty_UCS4 ch = TyUnicode_READ(kind, data, i); if (Ty_UNICODE_ISLOWER(ch) || Ty_UNICODE_ISTITLE(ch)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; else if (!cased && Ty_UNICODE_ISUPPER(ch)) cased = 1; } @@ -12171,7 +12171,7 @@ unicode_istitle_impl(TyObject *self) /* Special case for empty strings */ if (length == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; cased = 0; previous_is_cased = 0; @@ -12180,13 +12180,13 @@ unicode_istitle_impl(TyObject *self) if (Ty_UNICODE_ISUPPER(ch) || Ty_UNICODE_ISTITLE(ch)) { if (previous_is_cased) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; previous_is_cased = 1; cased = 1; } else if (Ty_UNICODE_ISLOWER(ch)) { if (!previous_is_cased) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; previous_is_cased = 1; cased = 1; } @@ -12224,14 +12224,14 @@ unicode_isspace_impl(TyObject *self) /* Special case for empty strings */ if (length == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; for (i = 0; i < length; i++) { const Ty_UCS4 ch = TyUnicode_READ(kind, data, i); if (!Ty_UNICODE_ISSPACE(ch)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -12262,13 +12262,13 @@ unicode_isalpha_impl(TyObject *self) /* Special case for empty strings */ if (length == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; for (i = 0; i < length; i++) { if (!Ty_UNICODE_ISALPHA(TyUnicode_READ(kind, data, i))) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -12300,14 +12300,14 @@ unicode_isalnum_impl(TyObject *self) /* Special case for empty strings */ if (len == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; for (i = 0; i < len; i++) { const Ty_UCS4 ch = TyUnicode_READ(kind, data, i); if (!Ty_UNICODE_ISALNUM(ch)) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -12338,13 +12338,13 @@ unicode_isdecimal_impl(TyObject *self) /* Special case for empty strings */ if (length == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; for (i = 0; i < length; i++) { if (!Ty_UNICODE_ISDECIMAL(TyUnicode_READ(kind, data, i))) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -12376,13 +12376,13 @@ unicode_isdigit_impl(TyObject *self) /* Special case for empty strings */ if (length == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; for (i = 0; i < length; i++) { if (!Ty_UNICODE_ISDIGIT(TyUnicode_READ(kind, data, i))) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -12413,13 +12413,13 @@ unicode_isnumeric_impl(TyObject *self) /* Special case for empty strings */ if (length == 0) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; for (i = 0; i < length; i++) { if (!Ty_UNICODE_ISNUMERIC(TyUnicode_READ(kind, data, i))) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } Ty_ssize_t @@ -12508,10 +12508,10 @@ unicode_isprintable_impl(TyObject *self) for (i = 0; i < length; i++) { if (!Ty_UNICODE_ISPRINTABLE(TyUnicode_READ(kind, data, i))) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -13620,11 +13620,11 @@ unicode_startswith_impl(TyObject *self, TyObject *subobj, Ty_ssize_t start, return NULL; } if (result) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } } /* nothing matched */ - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } if (!TyUnicode_Check(subobj)) { TyErr_Format(TyExc_TypeError, @@ -13676,10 +13676,10 @@ unicode_endswith_impl(TyObject *self, TyObject *subobj, Ty_ssize_t start, return NULL; } if (result) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } if (!TyUnicode_Check(subobj)) { TyErr_Format(TyExc_TypeError, @@ -14302,7 +14302,7 @@ unicode_sizeof_impl(TyObject *self) } static TyObject * -unicode_getnewargs(TyObject *v, TyObject *Ty_UNUSED(ignored)) +unicode_getnewargs(TyObject *v, TyObject *Py_UNUSED(ignored)) { TyObject *copy = _TyUnicode_Copy(v); if (!copy) @@ -14525,7 +14525,7 @@ static TyObject * unicode_mod(TyObject *v, TyObject *w) { if (!TyUnicode_Check(v)) - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; return TyUnicode_Format(v, w); } @@ -16289,7 +16289,7 @@ unicode_ascii_iter_next(TyObject *op) } static TyObject * -unicodeiter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) +unicodeiter_len(TyObject *op, TyObject *Py_UNUSED(ignored)) { unicodeiterobject *it = (unicodeiterobject *)op; Ty_ssize_t len = 0; @@ -16301,7 +16301,7 @@ unicodeiter_len(TyObject *op, TyObject *Ty_UNUSED(ignored)) PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); static TyObject * -unicodeiter_reduce(TyObject *op, TyObject *Ty_UNUSED(ignored)) +unicodeiter_reduce(TyObject *op, TyObject *Py_UNUSED(ignored)) { unicodeiterobject *it = (unicodeiterobject *)op; TyObject *iter = _TyEval_GetBuiltin(&_Ty_ID(iter)); @@ -16338,7 +16338,7 @@ unicodeiter_setstate(TyObject *op, TyObject *state) index = TyUnicode_GET_LENGTH(it->it_seq); /* iterator truncated */ it->it_index = index; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(setstate_doc, "Set state information for unpickling."); diff --git a/Objects/unionobject.c b/Objects/unionobject.c index 8c3b75f..1d4872d 100644 --- a/Objects/unionobject.c +++ b/Objects/unionobject.c @@ -70,7 +70,7 @@ union_hash(TyObject *self) static int unions_equal(unionobject *a, unionobject *b) { - int result = PyObject_RichCompareBool(a->hashable_args, b->hashable_args, Ty_EQ); + int result = PyObject_RichCompareBool(a->hashable_args, b->hashable_args, Py_EQ); if (result == -1) { return -1; } @@ -112,15 +112,15 @@ unions_equal(unionobject *a, unionobject *b) static TyObject * union_richcompare(TyObject *a, TyObject *b, int op) { - if (!_PyUnion_Check(b) || (op != Ty_EQ && op != Ty_NE)) { - Ty_RETURN_NOTIMPLEMENTED; + if (!_PyUnion_Check(b) || (op != Py_EQ && op != Py_NE)) { + Py_RETURN_NOTIMPLEMENTED; } int equal = unions_equal((unionobject*)a, (unionobject*)b); if (equal == -1) { return NULL; } - if (op == Ty_EQ) { + if (op == Py_EQ) { return TyBool_FromLong(equal); } else { @@ -257,7 +257,7 @@ TyObject * _Ty_union_type_or(TyObject* self, TyObject* other) { if (!is_unionable(self) || !is_unionable(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } unionbuilder ub; @@ -317,7 +317,7 @@ error: } static TyMemberDef union_members[] = { - {"__args__", _Ty_T_OBJECT, offsetof(unionobject, args), Ty_READONLY}, + {"__args__", _Ty_T_OBJECT, offsetof(unionobject, args), Py_READONLY}, {0} }; @@ -360,7 +360,7 @@ static PyMappingMethods union_as_mapping = { }; static TyObject * -union_parameters(TyObject *self, void *Ty_UNUSED(unused)) +union_parameters(TyObject *self, void *Py_UNUSED(unused)) { unionobject *alias = (unionobject *)self; if (union_init_parameters(alias) < 0) { @@ -370,13 +370,13 @@ union_parameters(TyObject *self, void *Ty_UNUSED(unused)) } static TyObject * -union_name(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(ignored)) +union_name(TyObject *Py_UNUSED(self), void *Py_UNUSED(ignored)) { return TyUnicode_FromString("Union"); } static TyObject * -union_origin(TyObject *Ty_UNUSED(self), void *Ty_UNUSED(ignored)) +union_origin(TyObject *Py_UNUSED(self), void *Py_UNUSED(ignored)) { return Ty_NewRef(&_PyUnion_Type); } diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 3495860..e99eb25 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -181,7 +181,7 @@ weakref_vectorcall(TyObject *self, TyObject *const *args, } TyObject *obj = _TyWeakref_GET_REF(self); if (obj == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return obj; } @@ -244,10 +244,10 @@ weakref_repr(TyObject *self) static TyObject * weakref_richcompare(TyObject* self, TyObject* other, int op) { - if ((op != Ty_EQ && op != Ty_NE) || + if ((op != Py_EQ && op != Py_NE) || !PyWeakref_Check(self) || !PyWeakref_Check(other)) { - Ty_RETURN_NOTIMPLEMENTED; + Py_RETURN_NOTIMPLEMENTED; } TyObject* obj = _TyWeakref_GET_REF(self); TyObject* other_obj = _TyWeakref_GET_REF(other); @@ -255,12 +255,12 @@ weakref_richcompare(TyObject* self, TyObject* other, int op) Ty_XDECREF(obj); Ty_XDECREF(other_obj); int res = (self == other); - if (op == Ty_NE) + if (op == Py_NE) res = !res; if (res) - Ty_RETURN_TRUE; + Py_RETURN_TRUE; else - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } TyObject* res = PyObject_RichCompare(obj, other_obj, op); Ty_DECREF(obj); @@ -485,7 +485,7 @@ weakref___init__(TyObject *self, TyObject *args, TyObject *kwargs) static TyMemberDef weakref_members[] = { - {"__callback__", _Ty_T_OBJECT, offsetof(PyWeakReference, wr_callback), Ty_READONLY}, + {"__callback__", _Ty_T_OBJECT, offsetof(PyWeakReference, wr_callback), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -586,7 +586,7 @@ proxy_check_ref(TyObject *obj) #define WRAP_METHOD(method, SPECIAL) \ static TyObject * \ - method(TyObject *proxy, TyObject *Ty_UNUSED(ignored)) { \ + method(TyObject *proxy, TyObject *Py_UNUSED(ignored)) { \ UNWRAP(proxy); \ TyObject* res = PyObject_CallMethodNoArgs(proxy, &_Ty_ID(SPECIAL)); \ Ty_DECREF(proxy); \ diff --git a/PC/_testconsole.c b/PC/_testconsole.c index 2817e73..e438c18 100644 --- a/PC/_testconsole.c +++ b/PC/_testconsole.c @@ -118,7 +118,7 @@ _testconsole_write_input_impl(TyObject *module, TyObject *file, Ty_buffer *s) TyMem_Free((void*)rec); - Ty_RETURN_NONE; + Py_RETURN_NONE; error: if (rec) TyMem_Free((void*)rec); @@ -136,7 +136,7 @@ static TyObject * _testconsole_read_output_impl(TyObject *module, TyObject *file) /*[clinic end generated code: output=876310d81a73e6d2 input=b3521f64b1b558e3]*/ { - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/PC/clinic/msvcrtmodule.c.h b/PC/clinic/msvcrtmodule.c.h index b6cd28d..e876a00 100644 --- a/PC/clinic/msvcrtmodule.c.h +++ b/PC/clinic/msvcrtmodule.c.h @@ -20,7 +20,7 @@ static TyObject * msvcrt_heapmin_impl(TyObject *module); static TyObject * -msvcrt_heapmin(TyObject *module, TyObject *Ty_UNUSED(ignored)) +msvcrt_heapmin(TyObject *module, TyObject *Py_UNUSED(ignored)) { return msvcrt_heapmin_impl(module); } @@ -212,7 +212,7 @@ static long msvcrt_kbhit_impl(TyObject *module); static TyObject * -msvcrt_kbhit(TyObject *module, TyObject *Ty_UNUSED(ignored)) +msvcrt_kbhit(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; long _return_value; @@ -246,7 +246,7 @@ static int msvcrt_getch_impl(TyObject *module); static TyObject * -msvcrt_getch(TyObject *module, TyObject *Ty_UNUSED(ignored)) +msvcrt_getch(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; char s[1]; @@ -272,7 +272,7 @@ static wchar_t msvcrt_getwch_impl(TyObject *module); static TyObject * -msvcrt_getwch(TyObject *module, TyObject *Ty_UNUSED(ignored)) +msvcrt_getwch(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; wchar_t _return_value; @@ -298,7 +298,7 @@ static int msvcrt_getche_impl(TyObject *module); static TyObject * -msvcrt_getche(TyObject *module, TyObject *Ty_UNUSED(ignored)) +msvcrt_getche(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; char s[1]; @@ -324,7 +324,7 @@ static wchar_t msvcrt_getwche_impl(TyObject *module); static TyObject * -msvcrt_getwche(TyObject *module, TyObject *Ty_UNUSED(ignored)) +msvcrt_getwche(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; wchar_t _return_value; @@ -665,7 +665,7 @@ static TyObject * msvcrt_GetErrorMode_impl(TyObject *module); static TyObject * -msvcrt_GetErrorMode(TyObject *module, TyObject *Ty_UNUSED(ignored)) +msvcrt_GetErrorMode(TyObject *module, TyObject *Py_UNUSED(ignored)) { return msvcrt_GetErrorMode_impl(module); } diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h index 0ee29ec..ce8b599 100644 --- a/PC/clinic/winreg.c.h +++ b/PC/clinic/winreg.c.h @@ -26,7 +26,7 @@ static TyObject * winreg_HKEYType_Close_impl(PyHKEYObject *self); static TyObject * -winreg_HKEYType_Close(TyObject *self, TyObject *Ty_UNUSED(ignored)) +winreg_HKEYType_Close(TyObject *self, TyObject *Py_UNUSED(ignored)) { return winreg_HKEYType_Close_impl((PyHKEYObject *)self); } @@ -56,7 +56,7 @@ static TyObject * winreg_HKEYType_Detach_impl(PyHKEYObject *self); static TyObject * -winreg_HKEYType_Detach(TyObject *self, TyObject *Ty_UNUSED(ignored)) +winreg_HKEYType_Detach(TyObject *self, TyObject *Py_UNUSED(ignored)) { return winreg_HKEYType_Detach_impl((PyHKEYObject *)self); } @@ -77,7 +77,7 @@ static PyHKEYObject * winreg_HKEYType___enter___impl(PyHKEYObject *self); static TyObject * -winreg_HKEYType___enter__(TyObject *self, TyObject *Ty_UNUSED(ignored)) +winreg_HKEYType___enter__(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; PyHKEYObject *_return_value; diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index 742512a..30b4084 100644 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -100,7 +100,7 @@ msvcrt_heapmin_impl(TyObject *module) if (_heapmin() != 0) return TyErr_SetFromErrno(TyExc_OSError); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] msvcrt.locking @@ -138,7 +138,7 @@ msvcrt_locking_impl(TyObject *module, int fd, int mode, long nbytes) if (err != 0) return TyErr_SetFromErrno(TyExc_OSError); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -332,7 +332,7 @@ msvcrt_putch_impl(TyObject *module, char char_value) _Ty_BEGIN_SUPPRESS_IPH _putch(char_value); _Ty_END_SUPPRESS_IPH - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef MS_WINDOWS_DESKTOP @@ -353,7 +353,7 @@ msvcrt_putwch_impl(TyObject *module, int unicode_char) _Ty_BEGIN_SUPPRESS_IPH _putwch(unicode_char); _Ty_END_SUPPRESS_IPH - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -384,7 +384,7 @@ msvcrt_ungetch_impl(TyObject *module, char char_value) if (res == EOF) return TyErr_SetFromErrno(TyExc_OSError); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef MS_WINDOWS_DESKTOP @@ -410,7 +410,7 @@ msvcrt_ungetwch_impl(TyObject *module, int unicode_char) if (res == WEOF) return TyErr_SetFromErrno(TyExc_OSError); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* MS_WINDOWS_DESKTOP */ diff --git a/PC/winreg.c b/PC/winreg.c index 16dbc97..4f99ee4 100644 --- a/PC/winreg.c +++ b/PC/winreg.c @@ -276,7 +276,7 @@ winreg_HKEYType_Close_impl(PyHKEYObject *self) if (!PyHKEY_Close(st, (TyObject *)self)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -338,7 +338,7 @@ winreg_HKEYType___exit___impl(PyHKEYObject *self, TyObject *exc_type, if (!PyHKEY_Close(st, (TyObject *)self)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -355,7 +355,7 @@ static struct TyMethodDef PyHKEY_methods[] = { #define OFF(e) offsetof(PyHKEYObject, e) static TyMemberDef PyHKEY_memberlist[] = { - {"handle", Ty_T_INT, OFF(hkey), Ty_READONLY}, + {"handle", Ty_T_INT, OFF(hkey), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -857,7 +857,7 @@ winreg_CloseKey(TyObject *module, TyObject *hkey) if (!PyHKEY_Close(_TyModule_GetState(module), hkey)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) @@ -1032,7 +1032,7 @@ winreg_DeleteKey_impl(TyObject *module, HKEY key, const wchar_t *sub_key) Ty_END_ALLOW_THREADS if (rc != ERROR_SUCCESS) return TyErr_SetFromWindowsErrWithFunction(rc, "RegDeleteKey"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1078,7 +1078,7 @@ winreg_DeleteKeyEx_impl(TyObject *module, HKEY key, const wchar_t *sub_key, Ty_END_ALLOW_THREADS if (rc != ERROR_SUCCESS) return TyErr_SetFromWindowsErrWithFunction(rc, "RegDeleteKeyEx"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1108,7 +1108,7 @@ winreg_DeleteValue_impl(TyObject *module, HKEY key, const wchar_t *value) if (rc !=ERROR_SUCCESS) return TyErr_SetFromWindowsErrWithFunction(rc, "RegDeleteValue"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1342,7 +1342,7 @@ winreg_FlushKey_impl(TyObject *module, HKEY key) Ty_END_ALLOW_THREADS if (rc != ERROR_SUCCESS) return TyErr_SetFromWindowsErrWithFunction(rc, "RegFlushKey"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* MS_WINDOWS_DESKTOP || MS_WINDOWS_SYSTEM */ @@ -1394,7 +1394,7 @@ winreg_LoadKey_impl(TyObject *module, HKEY key, const wchar_t *sub_key, Ty_END_ALLOW_THREADS if (rc != ERROR_SUCCESS) return TyErr_SetFromWindowsErrWithFunction(rc, "RegLoadKey"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* MS_WINDOWS_DESKTOP || MS_WINDOWS_SYSTEM */ @@ -1732,7 +1732,7 @@ winreg_SaveKey_impl(TyObject *module, HKEY key, const wchar_t *file_name) Ty_END_ALLOW_THREADS if (rc != ERROR_SUCCESS) return TyErr_SetFromWindowsErrWithFunction(rc, "RegSaveKey"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* MS_WINDOWS_DESKTOP || MS_WINDOWS_SYSTEM */ @@ -1969,7 +1969,7 @@ winreg_DisableReflectionKey_impl(TyObject *module, HKEY key) if (rc != ERROR_SUCCESS) return TyErr_SetFromWindowsErrWithFunction(rc, "RegDisableReflectionKey"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2018,7 +2018,7 @@ winreg_EnableReflectionKey_impl(TyObject *module, HKEY key) if (rc != ERROR_SUCCESS) return TyErr_SetFromWindowsErrWithFunction(rc, "RegEnableReflectionKey"); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/PC/winsound.c b/PC/winsound.c index 3560a91..6caf9c7 100644 --- a/PC/winsound.c +++ b/PC/winsound.c @@ -142,7 +142,7 @@ winsound_PlaySound_impl(TyObject *module, TyObject *sound, int flags) TyErr_SetString(TyExc_RuntimeError, "Failed to play sound"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -177,7 +177,7 @@ winsound_Beep_impl(TyObject *module, int frequency, int duration) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -205,7 +205,7 @@ winsound_MessageBeep_impl(TyObject *module, int type) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static struct TyMethodDef sound_methods[] = diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 9463cc8..86b416e 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -5728,7 +5728,7 @@ cleanup: } static TyMemberDef ast_type_members[] = { - {"__dictoffset__", Ty_T_PYSSIZET, offsetof(AST_object, dict), Ty_READONLY}, + {"__dictoffset__", Ty_T_PYSSIZET, offsetof(AST_object, dict), Py_READONLY}, {NULL} /* Sentinel */ }; @@ -6063,7 +6063,7 @@ static TyObject* ast2obj_list(struct ast_state *state, asdl_seq *seq, return result; } -static TyObject* ast2obj_object(struct ast_state *Ty_UNUSED(state), void *o) +static TyObject* ast2obj_object(struct ast_state *Py_UNUSED(state), void *o) { TyObject *op = (TyObject*)o; if (!op) { @@ -6075,14 +6075,14 @@ static TyObject* ast2obj_object(struct ast_state *Ty_UNUSED(state), void *o) #define ast2obj_identifier ast2obj_object #define ast2obj_string ast2obj_object -static TyObject* ast2obj_int(struct ast_state *Ty_UNUSED(state), long b) +static TyObject* ast2obj_int(struct ast_state *Py_UNUSED(state), long b) { return TyLong_FromLong(b); } /* Conversion Python -> AST */ -static int obj2ast_object(struct ast_state *Ty_UNUSED(state), TyObject* obj, TyObject** out, PyArena* arena) +static int obj2ast_object(struct ast_state *Py_UNUSED(state), TyObject* obj, TyObject** out, PyArena* arena) { if (obj == Ty_None) obj = NULL; @@ -6099,7 +6099,7 @@ static int obj2ast_object(struct ast_state *Ty_UNUSED(state), TyObject* obj, TyO return 0; } -static int obj2ast_constant(struct ast_state *Ty_UNUSED(state), TyObject* obj, TyObject** out, PyArena* arena) +static int obj2ast_constant(struct ast_state *Py_UNUSED(state), TyObject* obj, TyObject** out, PyArena* arena) { if (_TyArena_AddPyObject(arena, obj) < 0) { *out = NULL; @@ -6127,7 +6127,7 @@ static int obj2ast_string(struct ast_state *state, TyObject* obj, TyObject** out return obj2ast_object(state, obj, out, arena); } -static int obj2ast_int(struct ast_state* Ty_UNUSED(state), TyObject* obj, int* out, PyArena* arena) +static int obj2ast_int(struct ast_state* Py_UNUSED(state), TyObject* obj, int* out, PyArena* arena) { int i; if (!TyLong_Check(obj)) { @@ -8891,7 +8891,7 @@ ast2obj_mod(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -8967,7 +8967,7 @@ ast2obj_stmt(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -9571,7 +9571,7 @@ ast2obj_expr(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10183,7 +10183,7 @@ ast2obj_comprehension(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10227,7 +10227,7 @@ ast2obj_excepthandler(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10291,7 +10291,7 @@ ast2obj_arguments(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10350,7 +10350,7 @@ ast2obj_arg(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10409,7 +10409,7 @@ ast2obj_keyword(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10463,7 +10463,7 @@ ast2obj_alias(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10517,7 +10517,7 @@ ast2obj_withitem(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10551,7 +10551,7 @@ ast2obj_match_case(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10590,7 +10590,7 @@ ast2obj_pattern(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10750,7 +10750,7 @@ ast2obj_type_ignore(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; @@ -10788,7 +10788,7 @@ ast2obj_type_param(struct ast_state *state, void* _o) TyObject *result = NULL, *value = NULL; TyTypeObject *tp; if (!o) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (Ty_EnterRecursiveCall("during ast construction")) { return NULL; diff --git a/Python/_warnings.c b/Python/_warnings.c index a932ca7..094397f 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -274,7 +274,7 @@ get_warnings_context(PyInterpreterState *interp) return NULL; } if (ctx == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return ctx; } @@ -287,7 +287,7 @@ get_warnings_context_filters(PyInterpreterState *interp) return NULL; } if (ctx == Ty_None) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *context_filters = PyObject_GetAttr(ctx, &_Ty_ID(_filters)); Ty_DECREF(ctx); @@ -340,7 +340,7 @@ warnings_acquire_lock_impl(TyObject *module) return NULL; } warnings_lock(interp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -360,7 +360,7 @@ warnings_release_lock_impl(TyObject *module) TyErr_SetString(TyExc_RuntimeError, "cannot release un-acquired lock"); return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -806,7 +806,7 @@ warn_explicit(PyThreadState *tstate, TyObject *category, TyObject *message, are no more available to choose as action. It is safer to ignore the warning and do nothing. */ if (module == Ty_None) - Ty_RETURN_NONE; + Py_RETURN_NONE; if (registry && !TyDict_Check(registry) && (registry != Ty_None)) { TyErr_SetString(TyExc_TypeError, "'registry' must be a dict or None"); @@ -1352,7 +1352,7 @@ warnings_filters_mutated_lock_held_impl(TyObject *module) st->filters_version++; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Function to issue a warning message; may raise an exception. */ diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 8c86ada..d486a2c 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -339,7 +339,7 @@ builtin_all(TyObject *module, TyObject *iterable) } if (cmp == 0) { Ty_DECREF(it); - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } Ty_DECREF(it); @@ -349,7 +349,7 @@ builtin_all(TyObject *module, TyObject *iterable) else return NULL; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -388,7 +388,7 @@ builtin_any(TyObject *module, TyObject *iterable) } if (cmp > 0) { Ty_DECREF(it); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } } Ty_DECREF(it); @@ -398,7 +398,7 @@ builtin_any(TyObject *module, TyObject *iterable) else return NULL; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } /*[clinic input] @@ -617,7 +617,7 @@ filter_next(TyObject *self) } static TyObject * -filter_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +filter_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { filterobject *lz = _filterobject_CAST(self); return Ty_BuildValue("O(OO)", Ty_TYPE(lz), lz->func, lz->it); @@ -1215,7 +1215,7 @@ builtin_exec_impl(TyObject *module, TyObject *source, TyObject *globals, Ty_DECREF(globals); Ty_DECREF(locals); Ty_DECREF(v); - Ty_RETURN_NONE; + Py_RETURN_NONE; error: Ty_XDECREF(globals); @@ -1280,7 +1280,7 @@ builtin_globals_impl(TyObject *module) if (_TyErr_Occurred(tstate)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(globals); } @@ -1308,10 +1308,10 @@ builtin_hasattr_impl(TyObject *module, TyObject *obj, TyObject *name) return NULL; } if (v == NULL) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } Ty_DECREF(v); - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } @@ -1565,7 +1565,7 @@ check: } static TyObject * -map_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +map_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { mapobject *lz = _mapobject_CAST(self); Ty_ssize_t numargs = TyTuple_GET_SIZE(lz->iters); @@ -1596,7 +1596,7 @@ map_setstate(TyObject *self, TyObject *state) } mapobject *lz = _mapobject_CAST(self); lz->strict = strict; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef map_methods[] = { @@ -1725,7 +1725,7 @@ builtin_setattr_impl(TyObject *module, TyObject *obj, TyObject *name, { if (PyObject_SetAttr(obj, name, value) != 0) return NULL; - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1748,7 +1748,7 @@ builtin_delattr_impl(TyObject *module, TyObject *obj, TyObject *name) if (PyObject_DelAttr(obj, name) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1938,7 +1938,7 @@ builtin_locals_impl(TyObject *module) if (_TyErr_Occurred(tstate)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(locals); } @@ -1952,8 +1952,8 @@ min_max(TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames, int op) static const char * const keywords[] = {"key", "default", NULL}; static _TyArg_Parser _parser_min = {"|$OO:min", keywords, 0}; static _TyArg_Parser _parser_max = {"|$OO:max", keywords, 0}; - const char *name = (op == Ty_LT) ? "min" : "max"; - _TyArg_Parser *_parser = (op == Ty_LT) ? &_parser_min : &_parser_max; + const char *name = (op == Py_LT) ? "min" : "max"; + _TyArg_Parser *_parser = (op == Py_LT) ? &_parser_min : &_parser_max; if (nargs == 0) { TyErr_Format(TyExc_TypeError, "%s expected at least 1 argument, got 0", name); @@ -2066,7 +2066,7 @@ Fail_it: static TyObject * builtin_min(TyObject *self, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) { - return min_max(args, nargs, kwnames, Ty_LT); + return min_max(args, nargs, kwnames, Py_LT); } PyDoc_STRVAR(min_doc, @@ -2083,7 +2083,7 @@ With two or more positional arguments, return the smallest argument."); static TyObject * builtin_max(TyObject *self, TyObject *const *args, Ty_ssize_t nargs, TyObject *kwnames) { - return min_max(args, nargs, kwnames, Ty_GT); + return min_max(args, nargs, kwnames, Py_GT); } PyDoc_STRVAR(max_doc, @@ -2224,7 +2224,7 @@ builtin_print_impl(TyObject *module, TyObject * const *args, /* sys.stdout may be None when FILE* stdout isn't connected */ if (file == Ty_None) { Ty_DECREF(file); - Ty_RETURN_NONE; + Py_RETURN_NONE; } } else { @@ -2291,7 +2291,7 @@ builtin_print_impl(TyObject *module, TyObject * const *args, } Ty_DECREF(file); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -3246,7 +3246,7 @@ check: } static TyObject * -zip_reduce(TyObject *self, TyObject *Ty_UNUSED(ignored)) +zip_reduce(TyObject *self, TyObject *Py_UNUSED(ignored)) { zipobject *lz = _zipobject_CAST(self); /* Just recreate the zip with the internal iterator tuple */ @@ -3265,7 +3265,7 @@ zip_setstate(TyObject *self, TyObject *state) } zipobject *lz = _zipobject_CAST(self); lz->strict = strict; - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef zip_methods[] = { diff --git a/Python/ceval.c b/Python/ceval.c index f373b49..d308b26 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1417,7 +1417,7 @@ positional_only_passed_as_keyword(PyThreadState *tstate, PyCodeObject *co, continue; } - int cmp = PyObject_RichCompareBool(posonly_name, kwname, Ty_EQ); + int cmp = PyObject_RichCompareBool(posonly_name, kwname, Py_EQ); if ( cmp > 0) { if(TyList_Append(posonly_names, kwname) != 0) { @@ -1620,7 +1620,7 @@ initialize_locals(PyThreadState *tstate, PyFunctionObject *func, /* Slow fallback, just in case */ for (j = co->co_posonlyargcount; j < total_args; j++) { TyObject *varname = co_varnames[j]; - int cmp = PyObject_RichCompareBool( keyword, varname, Ty_EQ); + int cmp = PyObject_RichCompareBool( keyword, varname, Py_EQ); if (cmp > 0) { goto kw_found; } diff --git a/Python/clinic/_contextvars.c.h b/Python/clinic/_contextvars.c.h index f099f10..efe74d8 100644 --- a/Python/clinic/_contextvars.c.h +++ b/Python/clinic/_contextvars.c.h @@ -14,7 +14,7 @@ static TyObject * _contextvars_copy_context_impl(TyObject *module); static TyObject * -_contextvars_copy_context(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_contextvars_copy_context(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _contextvars_copy_context_impl(module); } diff --git a/Python/clinic/_warnings.c.h b/Python/clinic/_warnings.c.h index f81ad41..9b88355 100644 --- a/Python/clinic/_warnings.c.h +++ b/Python/clinic/_warnings.c.h @@ -21,7 +21,7 @@ static TyObject * warnings_acquire_lock_impl(TyObject *module); static TyObject * -warnings_acquire_lock(TyObject *module, TyObject *Ty_UNUSED(ignored)) +warnings_acquire_lock(TyObject *module, TyObject *Py_UNUSED(ignored)) { return warnings_acquire_lock_impl(module); } @@ -38,7 +38,7 @@ static TyObject * warnings_release_lock_impl(TyObject *module); static TyObject * -warnings_release_lock(TyObject *module, TyObject *Ty_UNUSED(ignored)) +warnings_release_lock(TyObject *module, TyObject *Py_UNUSED(ignored)) { return warnings_release_lock_impl(module); } @@ -280,7 +280,7 @@ static TyObject * warnings_filters_mutated_lock_held_impl(TyObject *module); static TyObject * -warnings_filters_mutated_lock_held(TyObject *module, TyObject *Ty_UNUSED(ignored)) +warnings_filters_mutated_lock_held(TyObject *module, TyObject *Py_UNUSED(ignored)) { return warnings_filters_mutated_lock_held_impl(module); } diff --git a/Python/clinic/bltinmodule.c.h b/Python/clinic/bltinmodule.c.h index 5faeb32..a687995 100644 --- a/Python/clinic/bltinmodule.c.h +++ b/Python/clinic/bltinmodule.c.h @@ -3,7 +3,7 @@ preserve [clinic start generated code]*/ #if defined(Ty_BUILD_CORE) && !defined(Ty_BUILD_CORE_MODULE) -# include "pycore_gc.h" // PyGC_Head +# include "pycore_gc.h" // TyGC_Head # include "pycore_runtime.h" // _Ty_ID() #endif #include "pycore_modsupport.h" // _TyArg_UnpackKeywords() @@ -44,7 +44,7 @@ builtin___import__(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, Ty #define NUM_KEYWORDS 5 static struct { - PyGC_Head _this_is_not_used; + TyGC_Head _this_is_not_used; PyObject_VAR_HEAD Ty_hash_t ob_hash; TyObject *ob_item[NUM_KEYWORDS]; @@ -270,7 +270,7 @@ builtin_compile(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, TyObj #define NUM_KEYWORDS 7 static struct { - PyGC_Head _this_is_not_used; + TyGC_Head _this_is_not_used; PyObject_VAR_HEAD Ty_hash_t ob_hash; TyObject *ob_item[NUM_KEYWORDS]; @@ -427,7 +427,7 @@ builtin_eval(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, TyObject #define NUM_KEYWORDS 2 static struct { - PyGC_Head _this_is_not_used; + TyGC_Head _this_is_not_used; PyObject_VAR_HEAD Ty_hash_t ob_hash; TyObject *ob_item[NUM_KEYWORDS]; @@ -508,7 +508,7 @@ builtin_exec(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, TyObject #define NUM_KEYWORDS 3 static struct { - PyGC_Head _this_is_not_used; + TyGC_Head _this_is_not_used; PyObject_VAR_HEAD Ty_hash_t ob_hash; TyObject *ob_item[NUM_KEYWORDS]; @@ -587,7 +587,7 @@ static TyObject * builtin_globals_impl(TyObject *module); static TyObject * -builtin_globals(TyObject *module, TyObject *Ty_UNUSED(ignored)) +builtin_globals(TyObject *module, TyObject *Py_UNUSED(ignored)) { return builtin_globals_impl(module); } @@ -813,7 +813,7 @@ static TyObject * builtin_locals_impl(TyObject *module); static TyObject * -builtin_locals(TyObject *module, TyObject *Ty_UNUSED(ignored)) +builtin_locals(TyObject *module, TyObject *Py_UNUSED(ignored)) { return builtin_locals_impl(module); } @@ -863,7 +863,7 @@ builtin_pow(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, TyObject #define NUM_KEYWORDS 3 static struct { - PyGC_Head _this_is_not_used; + TyGC_Head _this_is_not_used; PyObject_VAR_HEAD Ty_hash_t ob_hash; TyObject *ob_item[NUM_KEYWORDS]; @@ -941,7 +941,7 @@ builtin_print(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, TyObjec #define NUM_KEYWORDS 4 static struct { - PyGC_Head _this_is_not_used; + TyGC_Head _this_is_not_used; PyObject_VAR_HEAD Ty_hash_t ob_hash; TyObject *ob_item[NUM_KEYWORDS]; @@ -1085,7 +1085,7 @@ builtin_round(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, TyObjec #define NUM_KEYWORDS 2 static struct { - PyGC_Head _this_is_not_used; + TyGC_Head _this_is_not_used; PyObject_VAR_HEAD Ty_hash_t ob_hash; TyObject *ob_item[NUM_KEYWORDS]; @@ -1154,7 +1154,7 @@ builtin_sum(TyObject *module, TyObject *const *args, Ty_ssize_t nargs, TyObject #define NUM_KEYWORDS 1 static struct { - PyGC_Head _this_is_not_used; + TyGC_Head _this_is_not_used; PyObject_VAR_HEAD Ty_hash_t ob_hash; TyObject *ob_item[NUM_KEYWORDS]; diff --git a/Python/clinic/context.c.h b/Python/clinic/context.c.h index 01827b3..5fb2c8f 100644 --- a/Python/clinic/context.c.h +++ b/Python/clinic/context.c.h @@ -57,7 +57,7 @@ static TyObject * _contextvars_Context_items_impl(PyContext *self); static TyObject * -_contextvars_Context_items(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_contextvars_Context_items(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _contextvars_Context_items_impl((PyContext *)self); } @@ -75,7 +75,7 @@ static TyObject * _contextvars_Context_keys_impl(PyContext *self); static TyObject * -_contextvars_Context_keys(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_contextvars_Context_keys(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _contextvars_Context_keys_impl((PyContext *)self); } @@ -93,7 +93,7 @@ static TyObject * _contextvars_Context_values_impl(PyContext *self); static TyObject * -_contextvars_Context_values(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_contextvars_Context_values(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _contextvars_Context_values_impl((PyContext *)self); } @@ -111,7 +111,7 @@ static TyObject * _contextvars_Context_copy_impl(PyContext *self); static TyObject * -_contextvars_Context_copy(TyObject *self, TyObject *Ty_UNUSED(ignored)) +_contextvars_Context_copy(TyObject *self, TyObject *Py_UNUSED(ignored)) { return _contextvars_Context_copy_impl((PyContext *)self); } @@ -219,7 +219,7 @@ static TyObject * token_enter_impl(PyContextToken *self); static TyObject * -token_enter(TyObject *self, TyObject *Ty_UNUSED(ignored)) +token_enter(TyObject *self, TyObject *Py_UNUSED(ignored)) { return token_enter_impl((PyContextToken *)self); } diff --git a/Python/clinic/import.c.h b/Python/clinic/import.c.h index 49fc1fa..e5212f8 100644 --- a/Python/clinic/import.c.h +++ b/Python/clinic/import.c.h @@ -23,7 +23,7 @@ static TyObject * _imp_lock_held_impl(TyObject *module); static TyObject * -_imp_lock_held(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_imp_lock_held(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _imp_lock_held_impl(module); } @@ -44,7 +44,7 @@ static TyObject * _imp_acquire_lock_impl(TyObject *module); static TyObject * -_imp_acquire_lock(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_imp_acquire_lock(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _imp_acquire_lock_impl(module); } @@ -64,7 +64,7 @@ static TyObject * _imp_release_lock_impl(TyObject *module); static TyObject * -_imp_release_lock(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_imp_release_lock(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _imp_release_lock_impl(module); } @@ -135,7 +135,7 @@ static TyObject * _imp_extension_suffixes_impl(TyObject *module); static TyObject * -_imp_extension_suffixes(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_imp_extension_suffixes(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _imp_extension_suffixes_impl(module); } @@ -388,7 +388,7 @@ static TyObject * _imp__frozen_module_names_impl(TyObject *module); static TyObject * -_imp__frozen_module_names(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_imp__frozen_module_names(TyObject *module, TyObject *Py_UNUSED(ignored)) { return _imp__frozen_module_names_impl(module); } diff --git a/Python/clinic/instruction_sequence.c.h b/Python/clinic/instruction_sequence.c.h index 6128aec..c049976 100644 --- a/Python/clinic/instruction_sequence.c.h +++ b/Python/clinic/instruction_sequence.c.h @@ -201,7 +201,7 @@ static int InstructionSequenceType_new_label_impl(_PyInstructionSequence *self); static TyObject * -InstructionSequenceType_new_label(TyObject *self, TyObject *Ty_UNUSED(ignored)) +InstructionSequenceType_new_label(TyObject *self, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -288,7 +288,7 @@ static TyObject * InstructionSequenceType_get_nested_impl(_PyInstructionSequence *self); static TyObject * -InstructionSequenceType_get_nested(TyObject *self, TyObject *Ty_UNUSED(ignored)) +InstructionSequenceType_get_nested(TyObject *self, TyObject *Py_UNUSED(ignored)) { return InstructionSequenceType_get_nested_impl((_PyInstructionSequence *)self); } @@ -306,7 +306,7 @@ static TyObject * InstructionSequenceType_get_instructions_impl(_PyInstructionSequence *self); static TyObject * -InstructionSequenceType_get_instructions(TyObject *self, TyObject *Ty_UNUSED(ignored)) +InstructionSequenceType_get_instructions(TyObject *self, TyObject *Py_UNUSED(ignored)) { return InstructionSequenceType_get_instructions_impl((_PyInstructionSequence *)self); } diff --git a/Python/clinic/instrumentation.c.h b/Python/clinic/instrumentation.c.h index 0389f7d..a7bbe3e 100644 --- a/Python/clinic/instrumentation.c.h +++ b/Python/clinic/instrumentation.c.h @@ -310,7 +310,7 @@ static TyObject * monitoring_restart_events_impl(TyObject *module); static TyObject * -monitoring_restart_events(TyObject *module, TyObject *Ty_UNUSED(ignored)) +monitoring_restart_events(TyObject *module, TyObject *Py_UNUSED(ignored)) { return monitoring_restart_events_impl(module); } @@ -327,7 +327,7 @@ static TyObject * monitoring__all_events_impl(TyObject *module); static TyObject * -monitoring__all_events(TyObject *module, TyObject *Ty_UNUSED(ignored)) +monitoring__all_events(TyObject *module, TyObject *Py_UNUSED(ignored)) { return monitoring__all_events_impl(module); } diff --git a/Python/clinic/sysmodule.c.h b/Python/clinic/sysmodule.c.h index deeeb47..b8b7b05 100644 --- a/Python/clinic/sysmodule.c.h +++ b/Python/clinic/sysmodule.c.h @@ -174,7 +174,7 @@ static TyObject * sys_exception_impl(TyObject *module); static TyObject * -sys_exception(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_exception(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_exception_impl(module); } @@ -195,7 +195,7 @@ static TyObject * sys_exc_info_impl(TyObject *module); static TyObject * -sys_exc_info(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_exc_info(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_exc_info_impl(module); } @@ -267,7 +267,7 @@ static TyObject * sys_getdefaultencoding_impl(TyObject *module); static TyObject * -sys_getdefaultencoding(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getdefaultencoding(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_getdefaultencoding_impl(module); } @@ -285,7 +285,7 @@ static TyObject * sys_getfilesystemencoding_impl(TyObject *module); static TyObject * -sys_getfilesystemencoding(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getfilesystemencoding(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_getfilesystemencoding_impl(module); } @@ -303,7 +303,7 @@ static TyObject * sys_getfilesystemencodeerrors_impl(TyObject *module); static TyObject * -sys_getfilesystemencodeerrors(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getfilesystemencodeerrors(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_getfilesystemencodeerrors_impl(module); } @@ -444,7 +444,7 @@ static TyObject * sys_gettrace_impl(TyObject *module); static TyObject * -sys_gettrace(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_gettrace(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_gettrace_impl(module); } @@ -488,7 +488,7 @@ static TyObject * sys_getprofile_impl(TyObject *module); static TyObject * -sys_getprofile(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getprofile(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_getprofile_impl(module); } @@ -547,7 +547,7 @@ static double sys_getswitchinterval_impl(TyObject *module); static TyObject * -sys_getswitchinterval(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getswitchinterval(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; double _return_value; @@ -673,7 +673,7 @@ static int sys_get_coroutine_origin_tracking_depth_impl(TyObject *module); static TyObject * -sys_get_coroutine_origin_tracking_depth(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_get_coroutine_origin_tracking_depth(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -703,7 +703,7 @@ static TyObject * sys_get_asyncgen_hooks_impl(TyObject *module); static TyObject * -sys_get_asyncgen_hooks(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_get_asyncgen_hooks(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_get_asyncgen_hooks_impl(module); } @@ -725,7 +725,7 @@ static TyObject * sys_getrecursionlimit_impl(TyObject *module); static TyObject * -sys_getrecursionlimit(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getrecursionlimit(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_getrecursionlimit_impl(module); } @@ -755,7 +755,7 @@ static TyObject * sys_getwindowsversion_impl(TyObject *module); static TyObject * -sys_getwindowsversion(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getwindowsversion(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_getwindowsversion_impl(module); } @@ -783,7 +783,7 @@ static TyObject * sys__enablelegacywindowsfsencoding_impl(TyObject *module); static TyObject * -sys__enablelegacywindowsfsencoding(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__enablelegacywindowsfsencoding(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__enablelegacywindowsfsencoding_impl(module); } @@ -847,7 +847,7 @@ static TyObject * sys_getdlopenflags_impl(TyObject *module); static TyObject * -sys_getdlopenflags(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getdlopenflags(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_getdlopenflags_impl(module); } @@ -898,7 +898,7 @@ static TyObject * sys_get_int_max_str_digits_impl(TyObject *module); static TyObject * -sys_get_int_max_str_digits(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_get_int_max_str_digits(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_get_int_max_str_digits_impl(module); } @@ -1010,7 +1010,7 @@ static Ty_ssize_t sys_gettotalrefcount_impl(TyObject *module); static TyObject * -sys_gettotalrefcount(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_gettotalrefcount(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; Ty_ssize_t _return_value; @@ -1040,7 +1040,7 @@ static Ty_ssize_t sys_getallocatedblocks_impl(TyObject *module); static TyObject * -sys_getallocatedblocks(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getallocatedblocks(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; Ty_ssize_t _return_value; @@ -1184,7 +1184,7 @@ static TyObject * sys__current_frames_impl(TyObject *module); static TyObject * -sys__current_frames(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__current_frames(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__current_frames_impl(module); } @@ -1204,7 +1204,7 @@ static TyObject * sys__current_exceptions_impl(TyObject *module); static TyObject * -sys__current_exceptions(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__current_exceptions(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__current_exceptions_impl(module); } @@ -1263,7 +1263,7 @@ static TyObject * sys__debugmallocstats_impl(TyObject *module); static TyObject * -sys__debugmallocstats(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__debugmallocstats(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__debugmallocstats_impl(module); } @@ -1281,7 +1281,7 @@ static TyObject * sys__clear_type_cache_impl(TyObject *module); static TyObject * -sys__clear_type_cache(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__clear_type_cache(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__clear_type_cache_impl(module); } @@ -1299,7 +1299,7 @@ static TyObject * sys__clear_internal_caches_impl(TyObject *module); static TyObject * -sys__clear_internal_caches(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__clear_internal_caches(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__clear_internal_caches_impl(module); } @@ -1317,7 +1317,7 @@ static TyObject * sys_is_finalizing_impl(TyObject *module); static TyObject * -sys_is_finalizing(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_is_finalizing(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_is_finalizing_impl(module); } @@ -1337,7 +1337,7 @@ static TyObject * sys__stats_on_impl(TyObject *module); static TyObject * -sys__stats_on(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__stats_on(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__stats_on_impl(module); } @@ -1359,7 +1359,7 @@ static TyObject * sys__stats_off_impl(TyObject *module); static TyObject * -sys__stats_off(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__stats_off(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__stats_off_impl(module); } @@ -1381,7 +1381,7 @@ static TyObject * sys__stats_clear_impl(TyObject *module); static TyObject * -sys__stats_clear(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__stats_clear(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__stats_clear_impl(module); } @@ -1405,7 +1405,7 @@ static int sys__stats_dump_impl(TyObject *module); static TyObject * -sys__stats_dump(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__stats_dump(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -1437,7 +1437,7 @@ static TyObject * sys_getandroidapilevel_impl(TyObject *module); static TyObject * -sys_getandroidapilevel(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_getandroidapilevel(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_getandroidapilevel_impl(module); } @@ -1496,7 +1496,7 @@ static TyObject * sys_deactivate_stack_trampoline_impl(TyObject *module); static TyObject * -sys_deactivate_stack_trampoline(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_deactivate_stack_trampoline(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_deactivate_stack_trampoline_impl(module); } @@ -1514,7 +1514,7 @@ static TyObject * sys_is_stack_trampoline_active_impl(TyObject *module); static TyObject * -sys_is_stack_trampoline_active(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_is_stack_trampoline_active(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_is_stack_trampoline_active_impl(module); } @@ -1532,7 +1532,7 @@ static TyObject * sys_is_remote_debug_enabled_impl(TyObject *module); static TyObject * -sys_is_remote_debug_enabled(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys_is_remote_debug_enabled(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys_is_remote_debug_enabled_impl(module); } @@ -1760,7 +1760,7 @@ static int sys__get_cpu_count_config_impl(TyObject *module); static TyObject * -sys__get_cpu_count_config(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__get_cpu_count_config(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -1788,7 +1788,7 @@ static TyObject * sys__baserepl_impl(TyObject *module); static TyObject * -sys__baserepl(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__baserepl(TyObject *module, TyObject *Py_UNUSED(ignored)) { return sys__baserepl_impl(module); } @@ -1806,7 +1806,7 @@ static int sys__is_gil_enabled_impl(TyObject *module); static TyObject * -sys__is_gil_enabled(TyObject *module, TyObject *Ty_UNUSED(ignored)) +sys__is_gil_enabled(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -1834,7 +1834,7 @@ static int _jit_is_available_impl(TyObject *module); static TyObject * -_jit_is_available(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_jit_is_available(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -1862,7 +1862,7 @@ static int _jit_is_enabled_impl(TyObject *module); static TyObject * -_jit_is_enabled(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_jit_is_enabled(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; @@ -1890,7 +1890,7 @@ static int _jit_is_active_impl(TyObject *module); static TyObject * -_jit_is_active(TyObject *module, TyObject *Ty_UNUSED(ignored)) +_jit_is_active(TyObject *module, TyObject *Py_UNUSED(ignored)) { TyObject *return_value = NULL; int _return_value; diff --git a/Python/clinic/traceback.c.h b/Python/clinic/traceback.c.h index e94818e..175f0fe 100644 --- a/Python/clinic/traceback.c.h +++ b/Python/clinic/traceback.c.h @@ -97,7 +97,7 @@ static TyObject * traceback_tb_next_get_impl(PyTracebackObject *self); static TyObject * -traceback_tb_next_get(TyObject *self, void *Ty_UNUSED(context)) +traceback_tb_next_get(TyObject *self, void *Py_UNUSED(context)) { TyObject *return_value = NULL; @@ -122,7 +122,7 @@ static int traceback_tb_next_set_impl(PyTracebackObject *self, TyObject *value); static int -traceback_tb_next_set(TyObject *self, TyObject *value, void *Ty_UNUSED(context)) +traceback_tb_next_set(TyObject *self, TyObject *value, void *Py_UNUSED(context)) { int return_value; diff --git a/Python/codecs.c b/Python/codecs.c index 91b1dc9..cd37373 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -1512,56 +1512,56 @@ PyCodec_SurrogateEscapeErrors(TyObject *exc) // --- Codecs registry handlers ----------------------------------------------- static inline TyObject * -strict_errors(TyObject *Ty_UNUSED(self), TyObject *exc) +strict_errors(TyObject *Py_UNUSED(self), TyObject *exc) { return PyCodec_StrictErrors(exc); } static inline TyObject * -ignore_errors(TyObject *Ty_UNUSED(self), TyObject *exc) +ignore_errors(TyObject *Py_UNUSED(self), TyObject *exc) { return PyCodec_IgnoreErrors(exc); } static inline TyObject * -replace_errors(TyObject *Ty_UNUSED(self), TyObject *exc) +replace_errors(TyObject *Py_UNUSED(self), TyObject *exc) { return PyCodec_ReplaceErrors(exc); } static inline TyObject * -xmlcharrefreplace_errors(TyObject *Ty_UNUSED(self), TyObject *exc) +xmlcharrefreplace_errors(TyObject *Py_UNUSED(self), TyObject *exc) { return PyCodec_XMLCharRefReplaceErrors(exc); } static inline TyObject * -backslashreplace_errors(TyObject *Ty_UNUSED(self), TyObject *exc) +backslashreplace_errors(TyObject *Py_UNUSED(self), TyObject *exc) { return PyCodec_BackslashReplaceErrors(exc); } static inline TyObject * -namereplace_errors(TyObject *Ty_UNUSED(self), TyObject *exc) +namereplace_errors(TyObject *Py_UNUSED(self), TyObject *exc) { return PyCodec_NameReplaceErrors(exc); } static inline TyObject * -surrogatepass_errors(TyObject *Ty_UNUSED(self), TyObject *exc) +surrogatepass_errors(TyObject *Py_UNUSED(self), TyObject *exc) { return PyCodec_SurrogatePassErrors(exc); } static inline TyObject * -surrogateescape_errors(TyObject *Ty_UNUSED(self), TyObject *exc) +surrogateescape_errors(TyObject *Py_UNUSED(self), TyObject *exc) { return PyCodec_SurrogateEscapeErrors(exc); } diff --git a/Python/codegen.c b/Python/codegen.c index 9c98352..c424a63 100644 --- a/Python/codegen.c +++ b/Python/codegen.c @@ -96,12 +96,12 @@ typedef _PyCompile_FBlockInfo fblockinfo; RETURN_IF_ERROR(_PyInstructionSequence_UseLabel(INSTR_SEQUENCE(C), (LBL).id)) static const int compare_masks[] = { - [Ty_LT] = COMPARISON_LESS_THAN, - [Ty_LE] = COMPARISON_LESS_THAN | COMPARISON_EQUALS, - [Ty_EQ] = COMPARISON_EQUALS, - [Ty_NE] = COMPARISON_NOT_EQUALS, - [Ty_GT] = COMPARISON_GREATER_THAN, - [Ty_GE] = COMPARISON_GREATER_THAN | COMPARISON_EQUALS, + [Py_LT] = COMPARISON_LESS_THAN, + [Py_LE] = COMPARISON_LESS_THAN | COMPARISON_EQUALS, + [Py_EQ] = COMPARISON_EQUALS, + [Py_NE] = COMPARISON_NOT_EQUALS, + [Py_GT] = COMPARISON_GREATER_THAN, + [Py_GE] = COMPARISON_GREATER_THAN | COMPARISON_EQUALS, }; @@ -678,7 +678,7 @@ codegen_setup_annotations_scope(compiler *c, location loc, _Ty_DECLARE_STR(format, ".format"); ADDOP_I(c, loc, LOAD_FAST, 0); ADDOP_LOAD_CONST(c, loc, value_with_fake_globals); - ADDOP_I(c, loc, COMPARE_OP, (Ty_GT << 5) | compare_masks[Ty_GT]); + ADDOP_I(c, loc, COMPARE_OP, (Py_GT << 5) | compare_masks[Py_GT]); NEW_JUMP_TARGET_LABEL(c, body); ADDOP_JUMP(c, loc, POP_JUMP_IF_FALSE, body); ADDOP_I(c, loc, LOAD_COMMON_CONSTANT, CONSTANT_NOTIMPLEMENTEDERROR); @@ -1840,22 +1840,22 @@ codegen_addcompare(compiler *c, location loc, cmpop_ty op) int cmp; switch (op) { case Eq: - cmp = Ty_EQ; + cmp = Py_EQ; break; case NotEq: - cmp = Ty_NE; + cmp = Py_NE; break; case Lt: - cmp = Ty_LT; + cmp = Py_LT; break; case LtE: - cmp = Ty_LE; + cmp = Py_LE; break; case Gt: - cmp = Ty_GT; + cmp = Py_GT; break; case GtE: - cmp = Ty_GE; + cmp = Py_GE; break; case Is: ADDOP_I(c, loc, IS_OP, 0); diff --git a/Python/crossinterp.c b/Python/crossinterp.c index c60ff6c..f8cd234 100644 --- a/Python/crossinterp.c +++ b/Python/crossinterp.c @@ -1362,7 +1362,7 @@ _PyXI_excinfo_format(_PyXI_excinfo *info) return TyUnicode_FromString(info->msg); } else { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } diff --git a/Python/crossinterp_data_lookup.h b/Python/crossinterp_data_lookup.h index 96f02de..bf0e091 100644 --- a/Python/crossinterp_data_lookup.h +++ b/Python/crossinterp_data_lookup.h @@ -578,9 +578,9 @@ static TyObject * _new_bool_object(_PyXIData_t *xidata) { if (xidata->data){ - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } static int diff --git a/Python/errors.c b/Python/errors.c index 4987019..f00fde5 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -1608,7 +1608,7 @@ _TyErr_WriteUnraisableDefaultHook(TyObject *args) if (write_unraisable_exc(tstate, exc_type, exc_value, exc_tb, err_msg, obj) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 248aa3e..2c9880d 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -3668,7 +3668,7 @@ left = stack_pointer[-2]; TyObject *left_o = PyStackRef_AsPyObjectBorrow(left); TyObject *right_o = PyStackRef_AsPyObjectBorrow(right); - assert((oparg >> 5) <= Ty_GE); + assert((oparg >> 5) <= Py_GE); _TyFrame_SetStackPointer(frame, stack_pointer); TyObject *res_o = PyObject_RichCompare(left_o, right_o, oparg >> 5); _PyStackRef tmp = right; @@ -3769,7 +3769,7 @@ TyObject *right_o = PyStackRef_AsPyObjectBorrow(right); STAT_INC(COMPARE_OP, hit); int eq = _TyUnicode_Equal(left_o, right_o); - assert((oparg >> 5) == Ty_EQ || (oparg >> 5) == Ty_NE); + assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE); PyStackRef_CLOSE_SPECIALIZED(left, _TyUnicode_ExactDealloc); PyStackRef_CLOSE_SPECIALIZED(right, _TyUnicode_ExactDealloc); assert(eq == 0 || eq == 1); diff --git a/Python/fileutils.c b/Python/fileutils.c index ba58551..5d51078 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -87,7 +87,7 @@ _Ty_device_encoding(int fd) _Ty_END_SUPPRESS_IPH Ty_END_ALLOW_THREADS if (!valid) - Ty_RETURN_NONE; + Py_RETURN_NONE; #ifdef MS_WINDOWS #ifdef HAVE_WINDOWS_CONSOLE_IO @@ -101,12 +101,12 @@ _Ty_device_encoding(int fd) /* GetConsoleCP() and GetConsoleOutputCP() return 0 if the application has no console */ if (cp == 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyUnicode_FromFormat("cp%u", (unsigned int)cp); #else - Ty_RETURN_NONE; + Py_RETURN_NONE; #endif /* HAVE_WINDOWS_CONSOLE_IO */ #else if (_PyRuntime.preconfig.utf8_mode) { diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 198ba3d..830ded4 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -4751,7 +4751,7 @@ { TyObject *left_o = PyStackRef_AsPyObjectBorrow(left); TyObject *right_o = PyStackRef_AsPyObjectBorrow(right); - assert((oparg >> 5) <= Ty_GE); + assert((oparg >> 5) <= Py_GE); _TyFrame_SetStackPointer(frame, stack_pointer); TyObject *res_o = PyObject_RichCompare(left_o, right_o, oparg >> 5); _PyStackRef tmp = right; @@ -4955,7 +4955,7 @@ TyObject *right_o = PyStackRef_AsPyObjectBorrow(right); STAT_INC(COMPARE_OP, hit); int eq = _TyUnicode_Equal(left_o, right_o); - assert((oparg >> 5) == Ty_EQ || (oparg >> 5) == Ty_NE); + assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE); PyStackRef_CLOSE_SPECIALIZED(left, _TyUnicode_ExactDealloc); PyStackRef_CLOSE_SPECIALIZED(right, _TyUnicode_ExactDealloc); assert(eq == 0 || eq == 1); diff --git a/Python/hamt.c b/Python/hamt.c index 67155e3..32adb21 100644 --- a/Python/hamt.c +++ b/Python/hamt.c @@ -711,7 +711,7 @@ hamt_node_bitmap_assoc(PyHamtNode_Bitmap *self, /* key is not NULL. This means that we have only one other key in this collection that matches our hash for this shift. */ - int comp_err = PyObject_RichCompareBool(key, key_or_null, Ty_EQ); + int comp_err = PyObject_RichCompareBool(key, key_or_null, Py_EQ); if (comp_err < 0) { /* exception in __eq__ */ return NULL; } @@ -1015,7 +1015,7 @@ hamt_node_bitmap_without(PyHamtNode_Bitmap *self, else { /* We have a regular key/value pair */ - int cmp = PyObject_RichCompareBool(key_or_null, key, Ty_EQ); + int cmp = PyObject_RichCompareBool(key_or_null, key, Py_EQ); if (cmp < 0) { return W_ERROR; } @@ -1076,7 +1076,7 @@ hamt_node_bitmap_find(PyHamtNode_Bitmap *self, /* We have only one key -- a potential match. Let's compare if the key we are looking at is equal to the key we are looking for. */ assert(key != NULL); - comp_err = PyObject_RichCompareBool(key, key_or_null, Ty_EQ); + comp_err = PyObject_RichCompareBool(key, key_or_null, Py_EQ); if (comp_err < 0) { /* exception in __eq__ */ return F_ERROR; } @@ -1252,7 +1252,7 @@ hamt_node_collision_find_index(PyHamtNode_Collision *self, TyObject *key, el = self->c_array[i]; assert(el != NULL); - int cmp = PyObject_RichCompareBool(key, el, Ty_EQ); + int cmp = PyObject_RichCompareBool(key, el, Py_EQ); if (cmp < 0) { return F_ERROR; } @@ -2349,7 +2349,7 @@ _TyHamt_Eq(PyHamtObject *v, PyHamtObject *w) return 0; case F_FOUND: { - int cmp = PyObject_RichCompareBool(v_val, w_val, Ty_EQ); + int cmp = PyObject_RichCompareBool(v_val, w_val, Py_EQ); if (cmp < 0) { return -1; } @@ -2641,8 +2641,8 @@ hamt_tp_dealloc(TyObject *self) static TyObject * hamt_tp_richcompare(TyObject *v, TyObject *w, int op) { - if (!PyHamt_Check(v) || !PyHamt_Check(w) || (op != Ty_EQ && op != Ty_NE)) { - Ty_RETURN_NOTIMPLEMENTED; + if (!PyHamt_Check(v) || !PyHamt_Check(w) || (op != Py_EQ && op != Py_NE)) { + Py_RETURN_NOTIMPLEMENTED; } int res = _TyHamt_Eq((PyHamtObject *)v, (PyHamtObject *)w); @@ -2650,15 +2650,15 @@ hamt_tp_richcompare(TyObject *v, TyObject *w, int op) return NULL; } - if (op == Ty_NE) { + if (op == Py_NE) { res = !res; } if (res) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } else { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } } @@ -2737,7 +2737,7 @@ hamt_py_get(TyObject *op, TyObject *args) return Ty_NewRef(val); case F_NOT_FOUND: if (def == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(def); default: @@ -2767,7 +2767,7 @@ hamt_py_values(TyObject *op, TyObject *args) } static TyObject * -hamt_py_keys(TyObject *op, TyObject *Ty_UNUSED(args)) +hamt_py_keys(TyObject *op, TyObject *Py_UNUSED(args)) { PyHamtObject *self = _PyHamtObject_CAST(op); return _TyHamt_NewIterKeys(self); @@ -2775,7 +2775,7 @@ hamt_py_keys(TyObject *op, TyObject *Ty_UNUSED(args)) #ifdef Ty_DEBUG static TyObject * -hamt_py_dump(TyObject *op, TyObject *Ty_UNUSED(args)) +hamt_py_dump(TyObject *op, TyObject *Py_UNUSED(args)) { PyHamtObject *self = _PyHamtObject_CAST(op); return hamt_dump(self); diff --git a/Python/import.c b/Python/import.c index 0bd68ab..87486d8 100644 --- a/Python/import.c +++ b/Python/import.c @@ -3356,7 +3356,7 @@ get_path_importer(PyThreadState *tstate, TyObject *path_importer_cache, _TyErr_Clear(tstate); } if (importer == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (TyDict_SetItem(path_importer_cache, p, importer) < 0) { Ty_DECREF(importer); @@ -3559,7 +3559,7 @@ resolve_name(PyThreadState *tstate, TyObject *name, TyObject *globals, int level goto error; } - equal = PyObject_RichCompareBool(package, parent, Ty_EQ); + equal = PyObject_RichCompareBool(package, parent, Py_EQ); Ty_DECREF(parent); if (equal < 0) { goto error; @@ -4271,7 +4271,7 @@ _imp_acquire_lock_impl(TyObject *module) { PyInterpreterState *interp = _TyInterpreterState_GET(); _TyImport_AcquireLock(interp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -4293,7 +4293,7 @@ _imp_release_lock_impl(TyObject *module) return NULL; } _TyImport_ReleaseLock(interp); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -4318,7 +4318,7 @@ _imp__fix_co_filename_impl(TyObject *module, PyCodeObject *code, { update_compiled_module(code, path); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -4413,7 +4413,7 @@ _imp_init_frozen_impl(TyObject *module, TyObject *name) if (ret < 0) return NULL; if (ret == 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return import_add_module(tstate, name); } @@ -4444,10 +4444,10 @@ _imp_find_frozen_impl(TyObject *module, TyObject *name, int withdata) struct frozen_info info; frozen_status status = find_frozen(name, &info); if (status == FROZEN_NOT_FOUND || status == FROZEN_DISABLED) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } else if (status == FROZEN_BAD_NAME) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } else if (status != FROZEN_OKAY) { set_frozen_error(status, name); @@ -4586,9 +4586,9 @@ _imp_is_frozen_impl(TyObject *module, TyObject *name) struct frozen_info info; frozen_status status = find_frozen(name, &info); if (status != FROZEN_OKAY) { - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } /*[clinic input] @@ -4622,7 +4622,7 @@ _imp__override_frozen_modules_for_tests_impl(TyObject *module, int override) { PyInterpreterState *interp = _TyInterpreterState_GET(); OVERRIDE_FROZEN_MODULES(interp) = override; - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Python/instruction_sequence.c b/Python/instruction_sequence.c index 777d758..4d79872 100644 --- a/Python/instruction_sequence.c +++ b/Python/instruction_sequence.c @@ -262,7 +262,7 @@ InstructionSequenceType_use_label_impl(_PyInstructionSequence *self, if (_PyInstructionSequence_UseLabel(self, label) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -288,7 +288,7 @@ InstructionSequenceType_addop_impl(_PyInstructionSequence *self, int opcode, if (_PyInstructionSequence_Addop(self, opcode, oparg, loc) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -327,7 +327,7 @@ InstructionSequenceType_add_nested_impl(_PyInstructionSequence *self, if (_PyInstructionSequence_AddNested(self, (_PyInstructionSequence*)nested) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Python/instrumentation.c b/Python/instrumentation.c index cfac47d..aa3b96b 100644 --- a/Python/instrumentation.c +++ b/Python/instrumentation.c @@ -2171,7 +2171,7 @@ monitoring_use_tool_id_impl(TyObject *module, int tool_id, TyObject *name) return NULL; } interp->monitoring_tool_names[tool_id] = Ty_NewRef(name); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2198,7 +2198,7 @@ monitoring_clear_tool_id_impl(TyObject *module, int tool_id) } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2225,7 +2225,7 @@ monitoring_free_tool_id_impl(TyObject *module, int tool_id) } Ty_CLEAR(interp->monitoring_tool_names[tool_id]); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2248,7 +2248,7 @@ monitoring_get_tool_impl(TyObject *module, int tool_id) PyInterpreterState *interp = _TyInterpreterState_GET(); TyObject *name = interp->monitoring_tool_names[tool_id]; if (name == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return Ty_NewRef(name); } @@ -2289,7 +2289,7 @@ monitoring_register_callback_impl(TyObject *module, int tool_id, int event, } func = _PyMonitoring_RegisterCallback(tool_id, event_id, func); if (func == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return func; } @@ -2346,7 +2346,7 @@ monitoring_set_events_impl(TyObject *module, int tool_id, int event_set) if (_PyMonitoring_SetEvents(tool_id, event_set)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2427,7 +2427,7 @@ monitoring_set_local_events_impl(TyObject *module, int tool_id, if (_PyMonitoring_SetLocalEvents((PyCodeObject*)code, tool_id, event_set)) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2462,7 +2462,7 @@ monitoring_restart_events_impl(TyObject *module) if (res) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static int diff --git a/Python/intrinsics.c b/Python/intrinsics.c index ebe26e1..6157a19 100644 --- a/Python/intrinsics.c +++ b/Python/intrinsics.c @@ -25,7 +25,7 @@ no_intrinsic1(PyThreadState* tstate, TyObject *unused) } static TyObject * -print_expr(PyThreadState* Ty_UNUSED(ignored), TyObject *value) +print_expr(PyThreadState* Py_UNUSED(ignored), TyObject *value) { TyObject *hook = _TySys_GetRequiredAttr(&_Ty_ID(displayhook)); if (hook == NULL) { @@ -136,7 +136,7 @@ import_star(PyThreadState* tstate, TyObject *from) if (err < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -197,7 +197,7 @@ list_to_tuple(PyThreadState* unused, TyObject *v) } static TyObject * -make_typevar(PyThreadState* Ty_UNUSED(ignored), TyObject *v) +make_typevar(PyThreadState* Py_UNUSED(ignored), TyObject *v) { assert(TyUnicode_Check(v)); return _Ty_make_typevar(v, NULL, NULL); @@ -241,7 +241,7 @@ prep_reraise_star(PyThreadState* unused, TyObject *orig, TyObject *excs) } static TyObject * -make_typevar_with_bound(PyThreadState* Ty_UNUSED(ignored), TyObject *name, +make_typevar_with_bound(PyThreadState* Py_UNUSED(ignored), TyObject *name, TyObject *evaluate_bound) { assert(TyUnicode_Check(name)); @@ -249,7 +249,7 @@ make_typevar_with_bound(PyThreadState* Ty_UNUSED(ignored), TyObject *name, } static TyObject * -make_typevar_with_constraints(PyThreadState* Ty_UNUSED(ignored), TyObject *name, +make_typevar_with_constraints(PyThreadState* Py_UNUSED(ignored), TyObject *name, TyObject *evaluate_constraints) { assert(TyUnicode_Check(name)); diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c index 82cbfd6..6417b6c 100644 --- a/Python/legacy_tracing.c +++ b/Python/legacy_tracing.c @@ -39,7 +39,7 @@ call_profile_func(_PyLegacyEventHandler *self, TyObject *arg) { PyThreadState *tstate = _TyThreadState_GET(); if (tstate->c_profilefunc == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyFrameObject *frame = TyEval_GetFrame(); if (frame == NULL) { @@ -53,7 +53,7 @@ call_profile_func(_PyLegacyEventHandler *self, TyObject *arg) if (err) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -119,7 +119,7 @@ sys_profile_call_or_return( /* If no arg, skip */ if (self_arg == &_PyInstrumentation_MISSING) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *meth = Ty_TYPE(callable)->tp_descr_get( callable, self_arg, (TyObject*)Ty_TYPE(self_arg)); @@ -130,7 +130,7 @@ sys_profile_call_or_return( Ty_DECREF(meth); return res; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } int @@ -166,7 +166,7 @@ call_trace_func(_PyLegacyEventHandler *self, TyObject *arg) { PyThreadState *tstate = _TyThreadState_GET(); if (tstate->c_tracefunc == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyFrameObject *frame = TyEval_GetFrame(); if (frame == NULL) { @@ -187,7 +187,7 @@ call_trace_func(_PyLegacyEventHandler *self, TyObject *arg) if (err) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -293,7 +293,7 @@ sys_trace_instruction_func( if (_TyEval_SetOpcodeTrace(frame, false) != 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } Ty_INCREF(frame); int err = tstate->c_tracefunc(tstate->c_traceobj, frame, self->event, Ty_None); @@ -302,7 +302,7 @@ sys_trace_instruction_func( if (err) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -311,10 +311,10 @@ trace_line( PyFrameObject *frame, int line ) { if (!frame->f_trace_lines) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (line < 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } Ty_INCREF(frame); frame->f_lineno = line; @@ -324,7 +324,7 @@ trace_line( if (err) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * @@ -336,7 +336,7 @@ sys_trace_line_func( assert(kwnames == NULL); PyThreadState *tstate = _TyThreadState_GET(); if (tstate->c_tracefunc == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } assert(PyVectorcall_NARGS(nargsf) == 2); int line = TyLong_AsInt(args[1]); @@ -363,7 +363,7 @@ sys_trace_jump_func( assert(kwnames == NULL); PyThreadState *tstate = _TyThreadState_GET(); if (tstate->c_tracefunc == NULL) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } assert(PyVectorcall_NARGS(nargsf) == 3); int from = TyLong_AsInt(args[1])/sizeof(_Ty_CODEUNIT); @@ -391,7 +391,7 @@ sys_trace_jump_func( return NULL; } if (!frame->f_trace_lines) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return trace_line(tstate, self, frame, to_line); } diff --git a/Python/modsupport.c b/Python/modsupport.c index 71bbd06..ff9aa52 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -523,7 +523,7 @@ va_build_value(const char *format, va_list va) if (n < 0) return NULL; if (n == 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } va_copy(lva, va); if (n == 1) { diff --git a/Python/optimizer.c b/Python/optimizer.c index c532fef..eddf12c 100644 --- a/Python/optimizer.c +++ b/Python/optimizer.c @@ -182,19 +182,19 @@ _Ty_GetExecutor(PyCodeObject *code, int offset) } static TyObject * -is_valid(TyObject *self, TyObject *Ty_UNUSED(ignored)) +is_valid(TyObject *self, TyObject *Py_UNUSED(ignored)) { return TyBool_FromLong(((_PyExecutorObject *)self)->vm_data.valid); } static TyObject * -get_opcode(TyObject *self, TyObject *Ty_UNUSED(ignored)) +get_opcode(TyObject *self, TyObject *Py_UNUSED(ignored)) { return TyLong_FromUnsignedLong(((_PyExecutorObject *)self)->vm_data.opcode); } static TyObject * -get_oparg(TyObject *self, TyObject *Ty_UNUSED(ignored)) +get_oparg(TyObject *self, TyObject *Py_UNUSED(ignored)) { return TyLong_FromUnsignedLong(((_PyExecutorObject *)self)->vm_data.oparg); } @@ -382,7 +382,7 @@ executor_traverse(TyObject *o, visitproc visit, void *arg) } static TyObject * -get_jit_code(TyObject *self, TyObject *Ty_UNUSED(ignored)) +get_jit_code(TyObject *self, TyObject *Py_UNUSED(ignored)) { #ifndef _Ty_JIT TyErr_SetString(TyExc_RuntimeError, "JIT support not enabled."); @@ -390,7 +390,7 @@ get_jit_code(TyObject *self, TyObject *Ty_UNUSED(ignored)) #else _PyExecutorObject *executor = _PyExecutorObject_CAST(self); if (executor->jit_code == NULL || executor->jit_size == 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return TyBytes_FromStringAndSize(executor->jit_code, executor->jit_size); #endif diff --git a/Python/optimizer_symbols.c b/Python/optimizer_symbols.c index 38bef10..37625a2 100644 --- a/Python/optimizer_symbols.c +++ b/Python/optimizer_symbols.c @@ -724,7 +724,7 @@ make_bottom(JitOptContext *ctx) } TyObject * -_Py_uop_symbols_test(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(ignored)) +_Py_uop_symbols_test(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(ignored)) { JitOptContext context; JitOptContext *ctx = &context; @@ -860,7 +860,7 @@ _Py_uop_symbols_test(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(ignored)) Ty_DECREF(val_42); Ty_DECREF(val_43); Ty_DECREF(tuple); - Ty_RETURN_NONE; + Py_RETURN_NONE; fail: _Py_uop_abstractcontext_fini(ctx); diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 754df79..8eed324 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -2631,7 +2631,7 @@ create_stdio(const PyConfig *config, TyObject* io, const int buffered_stdio = config->buffered_stdio; if (!_Ty_IsValidFD(fd)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* stdin is always opened in buffered mode, first because it shouldn't @@ -2753,7 +2753,7 @@ error: _Ty_IsValidFD() check was called. Ignore the OSError and set the stream to None. */ TyErr_Clear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return NULL; } @@ -2905,7 +2905,7 @@ android_log_write_impl(TyObject *self, TyObject *args) // Despite its name, this function is part of the public API // (https://developer.android.com/ndk/reference/group/logging). __android_log_write(prio, tag, text); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2969,7 +2969,7 @@ apple_log_write_impl(TyObject *self, TyObject *args) // Pass the user-provided text through explicit %s formatting // to avoid % literals being interpreted as a formatting directive. os_log_with_type(OS_LOG_DEFAULT, logtype, "%s", text); - Ty_RETURN_NONE; + Py_RETURN_NONE; } diff --git a/Python/pystate.c b/Python/pystate.c index 6eb0e0e..fe96a95 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -84,7 +84,7 @@ current_fast_get(void) } static inline void -current_fast_set(_PyRuntimeState *Ty_UNUSED(runtime), PyThreadState *tstate) +current_fast_set(_PyRuntimeState *Py_UNUSED(runtime), PyThreadState *tstate) { assert(tstate != NULL); #ifdef HAVE_THREAD_LOCAL @@ -96,7 +96,7 @@ current_fast_set(_PyRuntimeState *Ty_UNUSED(runtime), PyThreadState *tstate) } static inline void -current_fast_clear(_PyRuntimeState *Ty_UNUSED(runtime)) +current_fast_clear(_PyRuntimeState *Py_UNUSED(runtime)) { #ifdef HAVE_THREAD_LOCAL _Ty_tss_tstate = NULL; @@ -1232,7 +1232,7 @@ _Ty_GetMainModule(PyThreadState *tstate) (void)PyMapping_GetOptionalItem(modules, &_Ty_ID(__main__), &module); Ty_DECREF(modules); if (module == NULL && !TyErr_Occurred()) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } return module; } diff --git a/Python/specialize.c b/Python/specialize.c index 5a9c8f6..30b73a4 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -1424,7 +1424,7 @@ _Py_Specialize_StoreAttr(_PyStackRef owner_st, _Py_CODEUNIT *instr, TyObject *na SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_EXPECTED_ERROR); goto fail; } - if (dmem->flags & Ty_READONLY) { + if (dmem->flags & Py_READONLY) { SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_ATTR_READ_ONLY); goto fail; } @@ -2766,7 +2766,7 @@ _Py_Specialize_CompareOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Py_CODEUNIT *i } if (TyUnicode_CheckExact(lhs)) { int cmp = oparg >> 5; - if (cmp != Ty_EQ && cmp != Ty_NE) { + if (cmp != Py_EQ && cmp != Py_NE) { SPECIALIZATION_FAIL(COMPARE_OP, SPEC_FAIL_COMPARE_OP_STRING); goto failure; } diff --git a/Python/structmember.c b/Python/structmember.c index 30d754b..5dc2091 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -156,7 +156,7 @@ PyMember_SetOne(char *addr, TyMemberDef *l, TyObject *v) #endif addr += l->offset; - if ((l->flags & Ty_READONLY)) + if ((l->flags & Py_READONLY)) { TyErr_SetString(TyExc_AttributeError, "readonly attribute"); return -1; diff --git a/Python/symtable.c b/Python/symtable.c index 8e430ba..c93c9dc 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -197,14 +197,14 @@ ste_dealloc(TyObject *op) #define OFF(x) offsetof(PySTEntryObject, x) static TyMemberDef ste_memberlist[] = { - {"id", _Ty_T_OBJECT, OFF(ste_id), Ty_READONLY}, - {"name", _Ty_T_OBJECT, OFF(ste_name), Ty_READONLY}, - {"symbols", _Ty_T_OBJECT, OFF(ste_symbols), Ty_READONLY}, - {"varnames", _Ty_T_OBJECT, OFF(ste_varnames), Ty_READONLY}, - {"children", _Ty_T_OBJECT, OFF(ste_children), Ty_READONLY}, - {"nested", Ty_T_INT, OFF(ste_nested), Ty_READONLY}, - {"type", Ty_T_INT, OFF(ste_type), Ty_READONLY}, - {"lineno", Ty_T_INT, OFF(ste_loc.lineno), Ty_READONLY}, + {"id", _Ty_T_OBJECT, OFF(ste_id), Py_READONLY}, + {"name", _Ty_T_OBJECT, OFF(ste_name), Py_READONLY}, + {"symbols", _Ty_T_OBJECT, OFF(ste_symbols), Py_READONLY}, + {"varnames", _Ty_T_OBJECT, OFF(ste_varnames), Py_READONLY}, + {"children", _Ty_T_OBJECT, OFF(ste_children), Py_READONLY}, + {"nested", Ty_T_INT, OFF(ste_nested), Py_READONLY}, + {"type", Ty_T_INT, OFF(ste_type), Py_READONLY}, + {"lineno", Ty_T_INT, OFF(ste_loc.lineno), Py_READONLY}, {NULL} }; diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 6d7056f..ad8cfd5 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -529,7 +529,7 @@ sys_addaudithook_impl(TyObject *module, TyObject *hook) if (_TyErr_ExceptionMatches(tstate, TyExc_Exception)) { /* We do not report errors derived from Exception */ _TyErr_Clear(tstate); - Ty_RETURN_NONE; + Py_RETURN_NONE; } return NULL; } @@ -548,7 +548,7 @@ sys_addaudithook_impl(TyObject *module, TyObject *hook) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -569,7 +569,7 @@ sys_audit_impl(TyObject *module, const char *event, TyObject *args) _Ty_EnsureTstateNotNULL(tstate); if (!should_audit(tstate->interp)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } int res = _TySys_Audit(tstate, event, "O", args); @@ -577,7 +577,7 @@ sys_audit_impl(TyObject *module, const char *event, TyObject *args) return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -593,7 +593,7 @@ sys_breakpointhook(TyObject *self, TyObject *const *args, Ty_ssize_t nargs, TyOb } else if (!strcmp(envar, "0")) { /* The breakpoint is explicitly no-op'd. */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* According to POSIX the string returned by getenv() might be invalidated * or the string content might be overwritten by a subsequent call to @@ -664,7 +664,7 @@ sys_breakpointhook(TyObject *self, TyObject *const *args, Ty_ssize_t nargs, TyOb return NULL; } /* The warning was (probably) issued. */ - Ty_RETURN_NONE; + Py_RETURN_NONE; } PyDoc_STRVAR(breakpointhook_doc, @@ -769,7 +769,7 @@ sys_displayhook(TyObject *module, TyObject *o) /* After printing, also assign to '_' */ /* Before, set '_' to None to avoid recursion */ if (o == Ty_None) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } if (PyObject_SetAttr(builtins, _Ty_LATIN1_CHR('_'), Ty_None) != 0) return NULL; @@ -807,7 +807,7 @@ sys_displayhook(TyObject *module, TyObject *o) if (PyObject_SetAttr(builtins, _Ty_LATIN1_CHR('_'), o) != 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -828,7 +828,7 @@ sys_excepthook_impl(TyObject *module, TyObject *exctype, TyObject *value, /*[clinic end generated code: output=18d99fdda21b6b5e input=ecf606fa826f19d9]*/ { TyErr_Display(NULL, value, traceback); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -850,7 +850,7 @@ sys_exception_impl(TyObject *module) if (err_info->exc_value != NULL) { return Ty_NewRef(err_info->exc_value); } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1156,7 +1156,7 @@ sys_settrace(TyObject *module, TyObject *function) return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1186,7 +1186,7 @@ sys__settraceallthreads(TyObject *module, TyObject *arg) TyEval_SetTraceAllThreads(func, argument); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1236,7 +1236,7 @@ sys_setprofile(TyObject *module, TyObject *function) return NULL; } } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1265,7 +1265,7 @@ sys__setprofileallthreads(TyObject *module, TyObject *arg) TyEval_SetProfileAllThreads(func, argument); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1315,7 +1315,7 @@ sys_setswitchinterval_impl(TyObject *module, double interval) return NULL; } _TyEval_SetSwitchInterval((unsigned long) (1e6 * interval)); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1369,7 +1369,7 @@ sys_setrecursionlimit_impl(TyObject *module, int new_limit) } Ty_SetRecursionLimit(new_limit); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1392,7 +1392,7 @@ sys_set_coroutine_origin_tracking_depth_impl(TyObject *module, int depth) if (_TyEval_SetCoroutineOriginTrackingDepth(depth) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -1480,7 +1480,7 @@ sys_set_asyncgen_hooks(TyObject *self, TyObject *args, TyObject *kw) goto error; } - Ty_RETURN_NONE; + Py_RETURN_NONE; error: _TyEval_SetAsyncGenFinalizer(cur_finalizer); @@ -1810,7 +1810,7 @@ sys__enablelegacywindowsfsencoding_impl(TyObject *module) if (_TyUnicode_EnableLegacyWindowsFSEncoding() < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* MS_WINDOWS */ @@ -1840,7 +1840,7 @@ sys_setdlopenflags_impl(TyObject *module, int new_val) { PyInterpreterState *interp = _TyInterpreterState_GET(); _TyImport_SetDLOpenFlags(interp, new_val); - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -1880,7 +1880,7 @@ sys_mdebug_impl(TyObject *module, int flag) { int flag; mallopt(M_DEBUG, flag); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #endif /* USE_MALLOPT */ @@ -1915,7 +1915,7 @@ sys_set_int_max_str_digits_impl(TyObject *module, int maxdigits) if (_TySys_SetIntMaxStrDigits(maxdigits) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } size_t @@ -2192,7 +2192,7 @@ sys__debugmallocstats_impl(TyObject *module) #endif _TyObject_DebugTypeStats(stderr); - Ty_RETURN_NONE; + Py_RETURN_NONE; } #ifdef Ty_TRACE_REFS @@ -2220,7 +2220,7 @@ sys__clear_type_cache_impl(TyObject *module) return NULL; } TyType_ClearCache(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2243,7 +2243,7 @@ sys__clear_internal_caches_impl(TyObject *module) } #endif TyType_ClearCache(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /* Note that, for now, we do not have a per-interpreter equivalent @@ -2275,7 +2275,7 @@ sys__stats_on_impl(TyObject *module) /*[clinic end generated code: output=aca53eafcbb4d9fe input=43b5bfe145299e55]*/ { _Ty_StatsOn(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2289,7 +2289,7 @@ sys__stats_off_impl(TyObject *module) /*[clinic end generated code: output=1534c1ee63812214 input=d1a84c60c56cbce2]*/ { _Ty_StatsOff(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2303,7 +2303,7 @@ sys__stats_clear_impl(TyObject *module) /*[clinic end generated code: output=fb65a2525ee50604 input=3e03f2654f44da96]*/ { _Ty_StatsClear(); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2388,7 +2388,7 @@ sys_activate_stack_trampoline_impl(TyObject *module, const char *backend) if (_PyPerfTrampoline_Init(1) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; #else TyErr_SetString(TyExc_ValueError, "perf trampoline not available"); return NULL; @@ -2411,7 +2411,7 @@ sys_deactivate_stack_trampoline_impl(TyObject *module) if (_PyPerfTrampoline_Init(0) < 0) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] @@ -2426,10 +2426,10 @@ sys_is_stack_trampoline_active_impl(TyObject *module) { #ifdef PY_HAVE_PERF_TRAMPOLINE if (_PyIsPerfTrampolineActive()) { - Ty_RETURN_TRUE; + Py_RETURN_TRUE; } #endif - Ty_RETURN_FALSE; + Py_RETURN_FALSE; } @@ -2444,7 +2444,7 @@ sys_is_remote_debug_enabled_impl(TyObject *module) /*[clinic end generated code: output=7ca3d38bdd5935eb input=7335c4a2fe8cf4f3]*/ { #if !defined(Ty_REMOTE_DEBUG) || !defined(Ty_SUPPORTS_REMOTE_DEBUG) - Ty_RETURN_FALSE; + Py_RETURN_FALSE; #else const PyConfig *config = _Ty_GetConfig(); return TyBool_FromLong(config->remote_debug); @@ -2540,7 +2540,7 @@ sys_remote_exec_impl(TyObject *module, int pid, TyObject *script) } Ty_DECREF(path); - Ty_RETURN_NONE; + Py_RETURN_NONE; error: Ty_DECREF(path); @@ -2570,7 +2570,7 @@ sys__dump_tracelets_impl(TyObject *module, TyObject *outpath) if (err) { return NULL; } - Ty_RETURN_NONE; + Py_RETURN_NONE; } @@ -2600,7 +2600,7 @@ sys__getframemodulename_impl(TyObject *module, int depth) f = f->previous; } if (f == NULL || PyStackRef_IsNull(f->f_funcobj)) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } TyObject *func = PyStackRef_AsPyObjectBorrow(f->f_funcobj); TyObject *r = TyFunction_GetModule(func); @@ -2637,7 +2637,7 @@ sys__baserepl_impl(TyObject *module) { PyCompilerFlags cf = _PyCompilerFlags_INIT; TyRun_AnyFileExFlags(stdin, "", 0, &cf); - Ty_RETURN_NONE; + Py_RETURN_NONE; } /*[clinic input] diff --git a/Python/traceback.c b/Python/traceback.c index d7cf49b..2c8da03 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -121,7 +121,7 @@ tb_new_impl(TyTypeObject *type, TyObject *tb_next, PyFrameObject *tb_frame, } static TyObject * -tb_dir(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(ignored)) +tb_dir(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(ignored)) { return Ty_BuildValue("[ssss]", "tb_frame", "tb_next", "tb_lasti", "tb_lineno"); @@ -154,14 +154,14 @@ tb_get_lineno(TyObject *op) } static TyObject * -tb_lineno_get(TyObject *op, void *Ty_UNUSED(_)) +tb_lineno_get(TyObject *op, void *Py_UNUSED(_)) { PyTracebackObject *self = _PyTracebackObject_CAST(op); int lineno = self->tb_lineno; if (lineno == -1) { lineno = tb_get_lineno(op); if (lineno < 0) { - Ty_RETURN_NONE; + Py_RETURN_NONE; } } return TyLong_FromLong(lineno); @@ -220,8 +220,8 @@ static TyMethodDef tb_methods[] = { }; static TyMemberDef tb_memberlist[] = { - {"tb_frame", _Ty_T_OBJECT, OFF(tb_frame), Ty_READONLY|Ty_AUDIT_READ}, - {"tb_lasti", Ty_T_INT, OFF(tb_lasti), Ty_READONLY}, + {"tb_frame", _Ty_T_OBJECT, OFF(tb_frame), Py_READONLY|Ty_AUDIT_READ}, + {"tb_lasti", Ty_T_INT, OFF(tb_lasti), Py_READONLY}, {NULL} /* Sentinel */ }; diff --git a/Python/tracemalloc.c b/Python/tracemalloc.c index e9a6b13..ea3c881 100644 --- a/Python/tracemalloc.c +++ b/Python/tracemalloc.c @@ -20,7 +20,7 @@ _Ty_DECLARE_STR(anon_unknown, ""); static void* raw_malloc(size_t size); static void raw_free(void *ptr); static int _PyTraceMalloc_TraceRef(TyObject *op, PyRefTracerEvent event, - void* Ty_UNUSED(ignore)); + void* Py_UNUSED(ignore)); #ifdef Ty_DEBUG # define TRACE_DEBUG @@ -1250,7 +1250,7 @@ _PyTraceMalloc_Fini(void) or if the object memory block is not already traced. */ static int _PyTraceMalloc_TraceRef(TyObject *op, PyRefTracerEvent event, - void* Ty_UNUSED(ignore)) + void* Py_UNUSED(ignore)) { if (event != PyRefTracer_CREATE) { return 0; diff --git a/Tools/peg_generator/peg_extension/peg_extension.c b/Tools/peg_generator/peg_extension/peg_extension.c index f8e35ca..9a9b303 100644 --- a/Tools/peg_generator/peg_extension/peg_extension.c +++ b/Tools/peg_generator/peg_extension/peg_extension.c @@ -106,27 +106,27 @@ error: } static TyObject * -clear_memo_stats(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(ignored)) +clear_memo_stats(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(ignored)) { #if defined(Ty_DEBUG) _TyPegen_clear_memo_statistics(); #endif - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyObject * -get_memo_stats(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(ignored)) +get_memo_stats(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(ignored)) { #if defined(Ty_DEBUG) return _TyPegen_get_memo_statistics(); #else - Ty_RETURN_NONE; + Py_RETURN_NONE; #endif } // TODO: Write to Python's sys.stdout instead of C's stdout. static TyObject * -dump_memo_stats(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(ignored)) +dump_memo_stats(TyObject *Py_UNUSED(self), TyObject *Py_UNUSED(ignored)) { #if defined(Ty_DEBUG) TyObject *list = _TyPegen_get_memo_statistics(); @@ -146,7 +146,7 @@ dump_memo_stats(TyObject *Ty_UNUSED(self), TyObject *Ty_UNUSED(ignored)) } Ty_DECREF(list); #endif - Ty_RETURN_NONE; + Py_RETURN_NONE; } static TyMethodDef ParseMethods[] = {