Skip to content

Commit 59bb298

Browse files
committed
Address Erlend's review
* Change Sphinx formatting * Don't change PyWeakref_GetObject() exception
1 parent 8de770d commit 59bb298

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

Doc/c-api/weakref.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ as much as it can.
5353
5454
.. c:function:: int PyWeakref_GetRef(PyObject *ref, PyObject **pobj)
5555
56-
Get the referenced object from a weak reference, *ref*, into ``*pobj``.
56+
Get the referenced object from a weak reference, *ref*, into *\*pobj*.
5757
Return 0 on success. Raise an exception and return -1 on error.
5858
59-
If the referent is no longer live, set ``*pobj`` to ``NULL`` and return 0.
59+
If the referent is no longer live, set *\*pobj* to ``NULL`` and return 0.
6060
6161
.. versionadded:: 3.13
6262

Modules/_testcapimodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3432,7 +3432,7 @@ check_weakref_capi(PyObject *self, PyObject *factory)
34323432
PyErr_Clear();
34333433

34343434
assert(PyWeakref_GetObject(invalid_weakref) == NULL);
3435-
assert(PyErr_ExceptionMatches(PyExc_TypeError));
3435+
assert(PyErr_ExceptionMatches(PyExc_SystemError));
34363436
PyErr_Clear();
34373437

34383438
Py_RETURN_NONE;

Objects/weakrefobject.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -915,14 +915,10 @@ PyWeakref_GetRef(PyObject *ref, PyObject **pobj)
915915
PyObject *
916916
PyWeakref_GetObject(PyObject *ref)
917917
{
918-
if (ref == NULL) {
918+
if (ref == NULL || !PyWeakref_Check(ref)) {
919919
PyErr_BadInternalCall();
920920
return NULL;
921921
}
922-
if (!PyWeakref_Check(ref)) {
923-
PyErr_SetString(PyExc_TypeError, "expected a weakref");
924-
return NULL;
925-
}
926922
return PyWeakref_GET_OBJECT(ref);
927923
}
928924

0 commit comments

Comments
 (0)