Skip to content

Commit

Permalink
[3.12] gh-87969: Align docs and docstrings with implementation for ct…
Browse files Browse the repository at this point in the history
…ypes' [w]string_at() (GH-25384) (GH-118046)

gh-87969: Align docs and docstrings with implementation for ctypes' [w]string_at() (GH-25384)

The implementation uses 'ptr' for the name of the first parameter of
ctypes.string_at() and ctypes.wstring_at(). Align docs and docstrings
with the naming used in the implementation.

(cherry picked from commit 81a926b)

Co-authored-by: Shreyan Avigyan <shreyan.avigyan@gmail.com>
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
  • Loading branch information
4 people committed Apr 19, 2024
1 parent f278b8f commit 26c659e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions Doc/library/ctypes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2072,13 +2072,13 @@ Utility functions
Does the same as the C ``sizeof`` operator.


.. function:: string_at(address, size=-1)
.. function:: string_at(ptr, size=-1)

This function returns the C string starting at memory address *address* as a bytes
object. If size is specified, it is used as size, otherwise the string is assumed
Return the byte string at *void \*ptr*.
If *size* is specified, it is used as size, otherwise the string is assumed
to be zero-terminated.

.. audit-event:: ctypes.string_at address,size ctypes.string_at
.. audit-event:: ctypes.string_at ptr,size ctypes.string_at


.. function:: WinError(code=None, descr=None)
Expand All @@ -2094,14 +2094,14 @@ Utility functions
alias of :exc:`OSError`.


.. function:: wstring_at(address, size=-1)
.. function:: wstring_at(ptr, size=-1)

This function returns the wide character string starting at memory address
*address* as a string. If *size* is specified, it is used as the number of
Return the wide-character string at *void \*ptr*.
If *size* is specified, it is used as the number of
characters of the string, otherwise the string is assumed to be
zero-terminated.

.. audit-event:: ctypes.wstring_at address,size ctypes.wstring_at
.. audit-event:: ctypes.wstring_at ptr,size ctypes.wstring_at


.. _ctypes-data-types:
Expand Down
8 changes: 4 additions & 4 deletions Lib/ctypes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -519,9 +519,9 @@ def cast(obj, typ):

_string_at = PYFUNCTYPE(py_object, c_void_p, c_int)(_string_at_addr)
def string_at(ptr, size=-1):
"""string_at(addr[, size]) -> string
"""string_at(ptr[, size]) -> string
Return the string at addr."""
Return the byte string at void *ptr."""
return _string_at(ptr, size)

try:
Expand All @@ -531,9 +531,9 @@ def string_at(ptr, size=-1):
else:
_wstring_at = PYFUNCTYPE(py_object, c_void_p, c_int)(_wstring_at_addr)
def wstring_at(ptr, size=-1):
"""wstring_at(addr[, size]) -> string
"""wstring_at(ptr[, size]) -> string
Return the string at addr."""
Return the wide-character string at void *ptr."""
return _wstring_at(ptr, size)


Expand Down

0 comments on commit 26c659e

Please sign in to comment.