Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 87655e2

Browse files
zoobazooba
authored
bpo-42800: Rename AUDIT_READ to PY_AUDIT_READ (GH-25736)
1 parent 9a2c2a9 commit 87655e2

6 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎Doc/extending/newtypes.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,23 +287,23 @@ combined using bitwise-OR.
287287
+===========================+==============================================+
288288
| :const:`READONLY` | Never writable. |
289289
+---------------------------+----------------------------------------------+
290-
| :const:`AUDIT_READ` | Emit an ``object.__getattr__`` |
290+
| :const:`PY_AUDIT_READ` | Emit an ``object.__getattr__`` |
291291
| | :ref:`audit events <audit-events>` before |
292292
| | reading. |
293293
+---------------------------+----------------------------------------------+
294294

295295
.. versionchanged:: 3.10
296296
:const:`RESTRICTED`, :const:`READ_RESTRICTED` and :const:`WRITE_RESTRICTED`
297297
are deprecated. However, :const:`READ_RESTRICTED` is an alias for
298-
:const:`AUDIT_READ`, so fields that specify either :const:`RESTRICTED` or
299-
:const:`READ_RESTRICTED` will also raise an audit event.
298+
:const:`PY_AUDIT_READ`, so fields that specify either :const:`RESTRICTED`
299+
or :const:`READ_RESTRICTED` will also raise an audit event.
300300

301301
.. index::
302302
single: READONLY
303303
single: READ_RESTRICTED
304304
single: WRITE_RESTRICTED
305305
single: RESTRICTED
306-
single: AUDIT_READ
306+
single: PY_AUDIT_READ
307307

308308
An interesting advantage of using the :c:member:`~PyTypeObject.tp_members` table to build
309309
descriptors that are used at runtime is that any attribute defined this way can

‎Include/structmember.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ typedef struct PyMemberDef {
6262
#define PY_WRITE_RESTRICTED 4
6363
#define RESTRICTED (READ_RESTRICTED | PY_WRITE_RESTRICTED)
6464

65-
#define AUDIT_READ READ_RESTRICTED
65+
#define PY_AUDIT_READ READ_RESTRICTED
6666

6767
/* Current API, use this */
6868
PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *);

‎Objects/descrobject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ member_get(PyMemberDescrObject *descr, PyObject *obj, PyObject *type)
164164
if (descr_check((PyDescrObject *)descr, obj, &res))
165165
return res;
166166

167-
if (descr->d_member->flags & AUDIT_READ) {
167+
if (descr->d_member->flags & PY_AUDIT_READ) {
168168
if (PySys_Audit("object.__getattr__", "Os",
169169
obj ? obj : Py_None, descr->d_member->name) < 0) {
170170
return NULL;

‎Objects/frameobject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
static PyMemberDef frame_memberlist[] = {
1515
{"f_back", T_OBJECT, OFF(f_back), READONLY},
16-
{"f_code", T_OBJECT, OFF(f_code), READONLY|AUDIT_READ},
16+
{"f_code", T_OBJECT, OFF(f_code), READONLY|PY_AUDIT_READ},
1717
{"f_builtins", T_OBJECT, OFF(f_builtins), READONLY},
1818
{"f_globals", T_OBJECT, OFF(f_globals), READONLY},
1919
{"f_trace_lines", T_BOOL, OFF(f_trace_lines), 0},

‎Objects/genobject.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,8 +741,8 @@ static PyGetSetDef gen_getsetlist[] = {
741741
};
742742

743743
static PyMemberDef gen_memberlist[] = {
744-
{"gi_frame", T_OBJECT, offsetof(PyGenObject, gi_frame), READONLY|AUDIT_READ},
745-
{"gi_code", T_OBJECT, offsetof(PyGenObject, gi_code), READONLY|AUDIT_READ},
744+
{"gi_frame", T_OBJECT, offsetof(PyGenObject, gi_frame), READONLY|PY_AUDIT_READ},
745+
{"gi_code", T_OBJECT, offsetof(PyGenObject, gi_code), READONLY|PY_AUDIT_READ},
746746
{NULL} /* Sentinel */
747747
};
748748

@@ -978,8 +978,8 @@ static PyGetSetDef coro_getsetlist[] = {
978978
};
979979

980980
static PyMemberDef coro_memberlist[] = {
981-
{"cr_frame", T_OBJECT, offsetof(PyCoroObject, cr_frame), READONLY|AUDIT_READ},
982-
{"cr_code", T_OBJECT, offsetof(PyCoroObject, cr_code), READONLY|AUDIT_READ},
981+
{"cr_frame", T_OBJECT, offsetof(PyCoroObject, cr_frame), READONLY|PY_AUDIT_READ},
982+
{"cr_code", T_OBJECT, offsetof(PyCoroObject, cr_code), READONLY|PY_AUDIT_READ},
983983
{"cr_origin", T_OBJECT, offsetof(PyCoroObject, cr_origin), READONLY},
984984
{NULL} /* Sentinel */
985985
};
@@ -1360,10 +1360,10 @@ static PyGetSetDef async_gen_getsetlist[] = {
13601360
};
13611361

13621362
static PyMemberDef async_gen_memberlist[] = {
1363-
{"ag_frame", T_OBJECT, offsetof(PyAsyncGenObject, ag_frame), READONLY|AUDIT_READ},
1363+
{"ag_frame", T_OBJECT, offsetof(PyAsyncGenObject, ag_frame), READONLY|PY_AUDIT_READ},
13641364
{"ag_running", T_BOOL, offsetof(PyAsyncGenObject, ag_running_async),
13651365
READONLY},
1366-
{"ag_code", T_OBJECT, offsetof(PyAsyncGenObject, ag_code), READONLY|AUDIT_READ},
1366+
{"ag_code", T_OBJECT, offsetof(PyAsyncGenObject, ag_code), READONLY|PY_AUDIT_READ},
13671367
{NULL} /* Sentinel */
13681368
};
13691369

‎Python/traceback.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static PyMethodDef tb_methods[] = {
147147
};
148148

149149
static PyMemberDef tb_memberlist[] = {
150-
{"tb_frame", T_OBJECT, OFF(tb_frame), READONLY|AUDIT_READ},
150+
{"tb_frame", T_OBJECT, OFF(tb_frame), READONLY|PY_AUDIT_READ},
151151
{"tb_lasti", T_INT, OFF(tb_lasti), READONLY},
152152
{"tb_lineno", T_INT, OFF(tb_lineno), READONLY},
153153
{NULL} /* Sentinel */

0 commit comments

Comments
 (0)