greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-106869: Use new PyMemberDef constant names (#106871)

Browse Source 
* Remove '#include "structmember.h"'.
* If needed, add <stddef.h> to get offsetof() function.
* Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
* Replace:

  * T_SHORT => Py_T_SHORT
  * T_INT => Py_T_INT
  * T_LONG => Py_T_LONG
  * T_FLOAT => Py_T_FLOAT
  * T_DOUBLE => Py_T_DOUBLE
  * T_STRING => Py_T_STRING
  * T_OBJECT => _Py_T_OBJECT
  * T_CHAR => Py_T_CHAR
  * T_BYTE => Py_T_BYTE
  * T_UBYTE => Py_T_UBYTE
  * T_USHORT => Py_T_USHORT
  * T_UINT => Py_T_UINT
  * T_ULONG => Py_T_ULONG
  * T_STRING_INPLACE => Py_T_STRING_INPLACE
  * T_BOOL => Py_T_BOOL
  * T_OBJECT_EX => Py_T_OBJECT_EX
  * T_LONGLONG => Py_T_LONGLONG
  * T_ULONGLONG => Py_T_ULONGLONG
  * T_PYSSIZET => Py_T_PYSSIZET
  * T_NONE => _Py_T_NONE
  * READONLY => Py_READONLY
  * PY_AUDIT_READ => Py_AUDIT_READ
  * READ_RESTRICTED => Py_AUDIT_READ
  * PY_WRITE_RESTRICTED => _Py_WRITE_RESTRICTED
  * RESTRICTED => (READ_RESTRICTED | _Py_WRITE_RESTRICTED)
This commit is contained in:
Victor Stinner
2023-07-25 15:28:30 +02:00
committed by GitHub
parent ed08238327
commit 1a3faba9f1
78 changed files with 472 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Objects/typevarobject.c
View File

@@ -3,7 +3,7 @@
#include "pycore_object.h" // _PyObject_GC_TRACK/UNTRACK
#include "pycore_typevarobject.h"
#include "pycore_unionobject.h" // _Py_union_type_or
#include "structmember.h"
/*[clinic input]
class typevar "typevarobject *" "&_PyTypeVar_Type"
@@ -244,10 +244,10 @@ typevar_repr(PyObject *self)
}
static PyMemberDef typevar_members[] = {
{"__name__", T_OBJECT, offsetof(typevarobject, name), READONLY},
{"__covariant__", T_BOOL, offsetof(typevarobject, covariant), READONLY},
{"__contravariant__", T_BOOL, offsetof(typevarobject, contravariant), READONLY},
{"__infer_variance__", T_BOOL, offsetof(typevarobject, infer_variance), READONLY},
{"__name__", _Py_T_OBJECT, offsetof(typevarobject, name), Py_READONLY},
{"__covariant__", Py_T_BOOL, offsetof(typevarobject, covariant), Py_READONLY},
{"__contravariant__", Py_T_BOOL, offsetof(typevarobject, contravariant), Py_READONLY},
{"__infer_variance__", Py_T_BOOL, offsetof(typevarobject, infer_variance), Py_READONLY},
{0}
};
@@ -555,7 +555,7 @@ paramspecattr_richcompare(PyObject *a, PyObject *b, int op)
}
static PyMemberDef paramspecattr_members[] = {
{"__origin__", T_OBJECT, offsetof(paramspecattrobject, __origin__), READONLY},
{"__origin__", _Py_T_OBJECT, offsetof(paramspecattrobject, __origin__), Py_READONLY},
{0}
};
@@ -780,11 +780,11 @@ paramspec_repr(PyObject *self)
}
static PyMemberDef paramspec_members[] = {
{"__name__", T_OBJECT, offsetof(paramspecobject, name), READONLY},
{"__bound__", T_OBJECT, offsetof(paramspecobject, bound), READONLY},
{"__covariant__", T_BOOL, offsetof(paramspecobject, covariant), READONLY},
{"__contravariant__", T_BOOL, offsetof(paramspecobject, contravariant), READONLY},
{"__infer_variance__", T_BOOL, offsetof(paramspecobject, infer_variance), READONLY},
{"__name__", _Py_T_OBJECT, offsetof(paramspecobject, name), Py_READONLY},
{"__bound__", _Py_T_OBJECT, offsetof(paramspecobject, bound), Py_READONLY},
{"__covariant__", Py_T_BOOL, offsetof(paramspecobject, covariant), Py_READONLY},
{"__contravariant__", Py_T_BOOL, offsetof(paramspecobject, contravariant), Py_READONLY},
{"__infer_variance__", Py_T_BOOL, offsetof(paramspecobject, infer_variance), Py_READONLY},
{0}
};
@@ -1054,7 +1054,7 @@ typevartuple_repr(PyObject *self)
}
static PyMemberDef typevartuple_members[] = {
{"__name__", T_OBJECT, offsetof(typevartupleobject, name), READONLY},
{"__name__", _Py_T_OBJECT, offsetof(typevartupleobject, name), Py_READONLY},
{0}
};
@@ -1292,7 +1292,7 @@ typealias_repr(PyObject *self)
}
static PyMemberDef typealias_members[] = {
{"__name__", T_OBJECT, offsetof(typealiasobject, name), READONLY},
{"__name__", _Py_T_OBJECT, offsetof(typealiasobject, name), Py_READONLY},
{0}
};