Skip to content

gh-118789: Restore hidden _PyWeakref_ClearRef #118797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 4 commits into from
May 10, 2024
Merged

gh-118789: Restore hidden _PyWeakref_ClearRef #118797

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d5ae9b
gh-118789: Restore hidden `_PyWeakref_ClearRef`
colesbury May 8, 2024
1cd8d00
Blurb
colesbury May 8, 2024
bad74c2
Only address _PyWeakref_ClearRef in this PR
colesbury May 8, 2024
35a62af
Move definition up to match 3.12
colesbury May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
gh-118789: Restore hidden _PyWeakref_ClearRef 
_PyWeakref_ClearRef was previously exposed in the public C-API, although
it begins with an underscore and is not documented. It's used by a few
C-API extensions. There is currently no alternative public API that can
replace its use.

_PyWeakref_ClearWeakRefsExceptCallbacks is the only thread-safe way to
use _PyWeakref_ClearRef in the free-threaded build. This exposes the C
symbol, but does not make the API public.
  • Loading branch information
@colesbury
colesbury committed May 8, 2024
commit 0d5ae9b32e1aa40f49e37624228ba77125da2410
2 changes: 2 additions & 0 deletions Include/cpython/weakrefobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ Py_DEPRECATED(3.13) static inline PyObject* PyWeakref_GET_OBJECT(PyObject *ref_o
return Py_None;
}
#define PyWeakref_GET_OBJECT(ref) PyWeakref_GET_OBJECT(_PyObject_CAST(ref))

PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self);
Comment thread
colesbury marked this conversation as resolved.
Outdated
4 changes: 1 addition & 3 deletions Include/internal/pycore_weakref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@ extern Py_ssize_t _PyWeakref_GetWeakrefCount(PyObject *obj);

// Clear all the weak references to obj but leave their callbacks uncalled and
// intact.
extern void _PyWeakref_ClearWeakRefsExceptCallbacks(PyObject *obj);

extern void _PyWeakref_ClearRef(PyWeakReference *self);
PyAPI_FUNC(void) _PyWeakref_ClearWeakRefsExceptCallbacks(PyObject *obj);

PyAPI_FUNC(int) _PyWeakref_IsDead(PyObject *weakref);

Expand Down