python
diff --git a/‎Doc/c-api/descriptor.rst‎
Lines changed: 2 additions & 2 deletions b/‎Doc/c-api/descriptor.rst‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎Include/descrobject.h‎
Lines changed: 1 addition & 1 deletion b/‎Include/descrobject.h‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Misc/NEWS.d/next/Core and Builtins/2021-02-15-13-41-14.bpo-40170.r2FAtl.rst‎
Lines changed: 3 additions & 0 deletions b/‎Misc/NEWS.d/next/Core and Builtins/2021-02-15-13-41-14.bpo-40170.r2FAtl.rst‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎Objects/descrobject.c‎
Lines changed: 5 additions & 0 deletions b/‎Objects/descrobject.c‎
Lines changed: 5 additions & 0 deletions
@@ -32,8 +32,8 @@ found in the dictionary of type objects.
 
 .. c:function:: int PyDescr_IsData(PyObject *descr)
 
-   Return true if the descriptor objects *descr* describes a data attribute, or
-   false if it describes a method.  *descr* must be a descriptor object; there is
+   Return non-zero if the descriptor objects *descr* describes a data attribute, or
+   ``0`` if it describes a method.  *descr* must be a descriptor object; there is
    no error checking.
 
 
 
@@ -93,7 +93,7 @@ PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *,
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *,
                                                 struct wrapperbase *, void *);
-#define PyDescr_IsData(d) (Py_TYPE(d)->tp_descr_set != NULL)
+PyAPI_FUNC(int) PyDescr_IsData(PyObject *);
 #endif
 
 PyAPI_FUNC(PyObject *) PyDictProxy_New(PyObject *);
 
@@ -0,0 +1,3 @@
+Convert :c:func:`PyDescr_IsData` macro to a function to hide implementation
+details: The macro accessed :c:member:`PyTypeObject.tp_descr_set` directly.
+Patch by Erlend E. Aasland.
@@ -995,6 +995,11 @@ PyDescr_NewWrapper(PyTypeObject *type, struct wrapperbase *base, void *wrapped)
     return (PyObject *)descr;
 }
 
+int
+PyDescr_IsData(PyObject *ob)
+{
+    return Py_TYPE(ob)->tp_descr_set != NULL;
+}
 
 /* --- mappingproxy: read-only proxy for mappings --- */
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Convert :c:func:`PyDescr_IsData` macro to a function to hide implementation
	`2`	+details: The macro accessed :c:member:`PyTypeObject.tp_descr_set` directly.
	`3`	`+Patch by Erlend E. Aasland.`
Original file line number	Diff line number	Diff line change
`@@ -995,6 +995,11 @@ PyDescr_NewWrapper(PyTypeObject type, struct wrapperbase base, void *wrapped)`
`995`	`995`	`return (PyObject *)descr;`
`996`	`996`	`}`
`997`	`997`
	`998`	`+int`
	`999`	`+PyDescr_IsData(PyObject *ob)`
	`1000`	`+{`
	`1001`	`+ return Py_TYPE(ob)->tp_descr_set != NULL;`
	`1002`	`+}`
`998`	`1003`
`999`	`1004`	`/* --- mappingproxy: read-only proxy for mappings --- */`
`1000`	`1005`