Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit83ac93f

Browse files
committed
gh-106572: Deprecate PyObject_SetAttr(v, name, NULL)
* Convert PyObject_DelAttr() and PyObject_DelAttrString() macros to functions.* Add PyObject_DelAttr() and PyObject_DelAttrString() functions to the stable ABI.* Replace PyObject_SetAttr(obj, name, NULL) with PyObject_DelAttr(obj, name).* weakref proxy_setattr() calls PyObject_DelAttr() if value is NULL.
1 parent9384665 commit83ac93f

File tree

15 files changed

+98
-25
lines changed

15 files changed

+98
-25
lines changed

‎Doc/c-api/object.rst‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ Object Protocol
8585
return ``0`` on success. This is the equivalent of the Python statement
8686
``o.attr_name = v``.
8787
88-
If *v* is ``NULL``, the attribute is deleted. This behaviour isdeprecated
89-
in favour of using:c:func:`PyObject_DelAttr`, but there are currently no
90-
plans to remove it.
88+
..deprecated::3.13
89+
Calling ``PyObject_SetAttrString(o, attr_name, NULL)`` is deprecated:
90+
``PyObject_DelAttr(o, attr_name)`` must be used instead.
9191
9292
9393
..c:function::intPyObject_SetAttrString(PyObject *o, const char *attr_name, PyObject *v)
@@ -97,8 +97,9 @@ Object Protocol
9797
return ``0`` on success. This is the equivalent of the Python statement
9898
``o.attr_name = v``.
9999
100-
If *v* is ``NULL``, the attribute is deleted, but this feature is
101-
deprecated in favour of using:c:func:`PyObject_DelAttrString`.
100+
..deprecated::3.13
101+
Calling ``PyObject_SetAttrString(o, attr_name, NULL)`` is deprecated:
102+
``PyObject_DelAttrString(o, attr_name)`` must be used instead.
102103
103104
104105
..c:function::intPyObject_GenericSetAttr(PyObject *o, PyObject *name, PyObject *value)

‎Doc/data/stable_abi.dat‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎Doc/whatsnew/3.13.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,14 @@ Deprecated
779779
:c:func:`PyWeakref_GetRef` on Python 3.12 and older.
780780
(Contributed by Victor Stinner in:gh:`105927`.)
781781

782+
* Deprecate ``PyObject_SetAttr(v, name, NULL)`` and
783+
``PyObject_SetAttrString(v, name, NULL)``: use ``PyObject_DelAttr(v, name)``
784+
and ``PyObject_DelAttrString(v, name)`` instead. When
785+
:c:func:`PyObject_SetAttr` is called with a ``NULL`` value, it's unclear if
786+
the caller wants to remove the attribute on purpose, or if the value is
787+
``NULL`` because of an error. Such API is error prone and should be avoided.
788+
(Contributed by Victor Stinner in:gh:`106572`.)
789+
782790
Removed
783791
-------
784792

‎Include/abstract.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,23 @@ extern "C" {
8080
8181
This is the equivalent of the Python statement o.attr_name=v. */
8282

83-
/* Implementedas a macro:
83+
/* Implementedelsewhere:
8484
8585
int PyObject_DelAttrString(PyObject *o, const char *attr_name);
8686
8787
Delete attribute named attr_name, for object o. Returns
8888
-1 on failure.
8989
9090
This is the equivalent of the Python statement: del o.attr_name. */
91-
#definePyObject_DelAttrString(O,A) PyObject_SetAttrString((O), (A), NULL)
9291

9392

94-
/* Implementedas a macro:
93+
/* Implementedelsewhere:
9594
9695
int PyObject_DelAttr(PyObject *o, PyObject *attr_name);
9796
9897
Delete attribute named attr_name, for object o. Returns -1
9998
on failure. This is the equivalent of the Python
10099
statement: del o.attr_name. */
101-
#definePyObject_DelAttr(O,A) PyObject_SetAttr((O), (A), NULL)
102100

103101

104102
/* Implemented elsewhere:

‎Include/object.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,11 @@ PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
391391
PyAPI_FUNC(int)PyObject_RichCompareBool(PyObject*,PyObject*,int);
392392
PyAPI_FUNC(PyObject*)PyObject_GetAttrString(PyObject*,constchar*);
393393
PyAPI_FUNC(int)PyObject_SetAttrString(PyObject*,constchar*,PyObject*);
394+
PyAPI_FUNC(int)PyObject_DelAttrString(PyObject*v,constchar*name);
394395
PyAPI_FUNC(int)PyObject_HasAttrString(PyObject*,constchar*);
395396
PyAPI_FUNC(PyObject*)PyObject_GetAttr(PyObject*,PyObject*);
396397
PyAPI_FUNC(int)PyObject_SetAttr(PyObject*,PyObject*,PyObject*);
398+
PyAPI_FUNC(int)PyObject_DelAttr(PyObject*v,PyObject*name);
397399
PyAPI_FUNC(int)PyObject_HasAttr(PyObject*,PyObject*);
398400
PyAPI_FUNC(PyObject*)PyObject_SelfIter(PyObject*);
399401
PyAPI_FUNC(PyObject*)PyObject_GenericGetAttr(PyObject*,PyObject*);

‎Lib/test/test_stable_abi_ctypes.py‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Deprecate ``PyObject_SetAttr(v, name, NULL)`` and
2+
``PyObject_SetAttrString(v, name, NULL)``: use ``PyObject_DelAttr(v, name)``
3+
and ``PyObject_DelAttrString(v, name)`` instead. When
4+
:c:func:`PyObject_SetAttr` is called with a ``NULL`` value, it's unclear if the
5+
caller wants to remove the attribute on purpose, or if the value is ``NULL``
6+
because of an error. Such API is error prone and should be avoided. Patch by
7+
Victor Stinner.

‎Misc/stable_abi.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,3 +2432,7 @@
24322432
added ='3.13'
24332433
[function.PyWeakref_GetRef]
24342434
added ='3.13'
2435+
[function.PyObject_DelAttr]
2436+
added ='3.13'
2437+
[function.PyObject_DelAttrString]
2438+
added ='3.13'

‎Objects/object.c‎

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -926,8 +926,8 @@ PyObject_HasAttrString(PyObject *v, const char *name)
926926
returnok;
927927
}
928928

929-
int
930-
PyObject_SetAttrString(PyObject*v,constchar*name,PyObject*w)
929+
staticint
930+
object_set_attr_string(PyObject*v,constchar*name,PyObject*w)
931931
{
932932
PyObject*s;
933933
intres;
@@ -942,6 +942,26 @@ PyObject_SetAttrString(PyObject *v, const char *name, PyObject *w)
942942
returnres;
943943
}
944944

945+
int
946+
PyObject_SetAttrString(PyObject*v,constchar*name,PyObject*w)
947+
{
948+
if (w==NULL
949+
&&PyErr_WarnEx(PyExc_DeprecationWarning,
950+
"PyObject_SetAttrString(v, name, NULL) is deprecated: "
951+
"use PyObject_DelAttrString(v, name) instead",
952+
1)<0)
953+
{
954+
return-1;
955+
}
956+
returnobject_set_attr_string(v,name,w);
957+
}
958+
959+
int
960+
PyObject_DelAttrString(PyObject*v,constchar*name)
961+
{
962+
returnobject_set_attr_string(v,name,NULL);
963+
}
964+
945965
int
946966
_PyObject_IsAbstract(PyObject*obj)
947967
{
@@ -1136,8 +1156,8 @@ PyObject_HasAttr(PyObject *v, PyObject *name)
11361156
return1;
11371157
}
11381158

1139-
int
1140-
PyObject_SetAttr(PyObject*v,PyObject*name,PyObject*value)
1159+
staticint
1160+
object_set_attr(PyObject*v,PyObject*name,PyObject*value)
11411161
{
11421162
PyTypeObject*tp=Py_TYPE(v);
11431163
interr;
@@ -1185,6 +1205,26 @@ PyObject_SetAttr(PyObject *v, PyObject *name, PyObject *value)
11851205
return-1;
11861206
}
11871207

1208+
int
1209+
PyObject_SetAttr(PyObject*v,PyObject*name,PyObject*value)
1210+
{
1211+
if (value==NULL
1212+
&&PyErr_WarnEx(PyExc_DeprecationWarning,
1213+
"PyObject_SetAttr(v, name, NULL) is deprecated: "
1214+
"use PyObject_DelAttr(v, name) instead",
1215+
1)<0)
1216+
{
1217+
return-1;
1218+
}
1219+
returnobject_set_attr(v,name,value);
1220+
}
1221+
1222+
int
1223+
PyObject_DelAttr(PyObject*v,PyObject*name)
1224+
{
1225+
returnobject_set_attr(v,name,NULL);
1226+
}
1227+
11881228
PyObject**
11891229
_PyObject_ComputedDictPointer(PyObject*obj)
11901230
{

‎Objects/weakrefobject.c‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,13 @@ proxy_setattr(PyObject *proxy, PyObject *name, PyObject *value)
485485
if (!proxy_check_ref(obj)) {
486486
return-1;
487487
}
488-
intres=PyObject_SetAttr(obj,name,value);
488+
intres;
489+
if (value!=NULL) {
490+
res=PyObject_SetAttr(obj,name,value);
491+
}
492+
else {
493+
res=PyObject_DelAttr(obj,name);
494+
}
489495
Py_DECREF(obj);
490496
returnres;
491497
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp