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

[3.13] gh-146056: Fix repr() for lists containing NULLs (GH-146129) (GH-146155)#146271

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.

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

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
7 changes: 5 additions & 2 deletionsDoc/c-api/file.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,9 +123,12 @@ the :mod:`io` APIs instead.

Write object *obj* to file object *p*. The only supported flag for *flags* is
:c:macro:`Py_PRINT_RAW`; if given, the :func:`str` of the object is written
instead of the :func:`repr`. Return ``0`` on success or ``-1`` on failure; the
appropriate exception will be set.
instead of the :func:`repr`.

If *obj* is ``NULL``, write the string ``"<NULL>"``.

Return ``0`` on success or ``-1`` on failure; the
appropriate exception will be set.

.. c:function:: int PyFile_WriteString(const char *s, PyObject *p)

Expand Down
8 changes: 8 additions & 0 deletionsDoc/c-api/object.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,6 +319,8 @@ Object Protocol
representation on success, ``NULL`` on failure. This is the equivalent of the
Python expression ``repr(o)``. Called by the :func:`repr` built-in function.

If argument is ``NULL``, return the string ``'<NULL>'``.

.. versionchanged:: 3.4
This function now includes a debug assertion to help ensure that it
does not silently discard an active exception.
Expand All@@ -333,6 +335,8 @@ Object Protocol
a string similar to that returned by :c:func:`PyObject_Repr` in Python 2.
Called by the :func:`ascii` built-in function.

If argument is ``NULL``, return the string ``'<NULL>'``.

.. index:: string; PyObject_Str (C function)


Expand All@@ -343,6 +347,8 @@ Object Protocol
Python expression ``str(o)``. Called by the :func:`str` built-in function
and, therefore, by the :func:`print` function.

If argument is ``NULL``, return the string ``'<NULL>'``.

.. versionchanged:: 3.4
This function now includes a debug assertion to help ensure that it
does not silently discard an active exception.
Expand All@@ -358,6 +364,8 @@ Object Protocol
a TypeError is raised when *o* is an integer instead of a zero-initialized
bytes object.

If argument is ``NULL``, return the :class:`bytes` object ``b'<NULL>'``.


.. c:function:: int PyObject_IsSubclass(PyObject *derived, PyObject *cls)

Expand Down
4 changes: 4 additions & 0 deletionsLib/test/test_capi/test_list.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -352,6 +352,10 @@ def test_list_extend(self):
# CRASHES list_extend(NULL, [])
# CRASHES list_extend([], NULL)

deftest_uninitialized_list_repr(self):
lst=_testlimitedcapi.list_new(3)
self.assertEqual(repr(lst),'[<NULL>, <NULL>, <NULL>]')


if__name__=="__main__":
unittest.main()
5 changes: 5 additions & 0 deletionsLib/test/test_capi/test_tuple.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,5 +257,10 @@ def test__tuple_resize(self):
self.assertRaises(SystemError, resize, [1, 2, 3], 0, False)
self.assertRaises(SystemError, resize, NULL, 0, False)

def test_uninitialized_tuple_repr(self):
tup = _testlimitedcapi.tuple_new(3)
self.assertEqual(repr(tup), '(<NULL>, <NULL>, <NULL>)')


if __name__ == "__main__":
unittest.main()
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
Fix:func:`repr` for lists containing ``NULL``\s.
2 changes: 1 addition & 1 deletionObjects/listobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -604,7 +604,7 @@ list_repr_impl(PyListObject *v)
so must refetch the list size on each iteration. */
for (i = 0; i < Py_SIZE(v); ++i) {
/* Hold a strong reference since repr(item) can mutate the list */
item =Py_NewRef(v->ob_item[i]);
item =Py_XNewRef(v->ob_item[i]);

if (i > 0) {
if (_PyUnicodeWriter_WriteASCIIString(&writer, ", ", 2) < 0)
Expand Down
Loading

[8]ページ先頭

©2009-2026 Movatter.jp