traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge #19411: Clarify that b2a_hex/hexlify returns a bytes object.

This commit is contained in:
R David Murray 2013-11-03 13:22:17 -05:00
parent af734963d1 5fdb64b5a0
commit c3f57e4a35
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/binascii.rst
View File

@ -145,7 +145,7 @@ The :mod:`binascii` module defines the following functions:
Return the hexadecimal representation of the binary *data*. Every byte of Return the hexadecimal representation of the binary *data*. Every byte of
*data* is converted into the corresponding 2-digit hex representation. The *data* is converted into the corresponding 2-digit hex representation. The
resulting string is therefore twice as long as the length of *data*. returned bytes object is therefore twice as long as the length of *data*.
.. function:: a2b_hex(hexstr) .. function:: a2b_hex(hexstr)

3
Modules/binascii.c
View File

@ -1122,7 +1122,8 @@ binascii_hexlify(PyObject *self, PyObject *args)
PyDoc_STRVAR(doc_hexlify, PyDoc_STRVAR(doc_hexlify,
"b2a_hex(data) -> s; Hexadecimal representation of binary data.\n\ "b2a_hex(data) -> s; Hexadecimal representation of binary data.\n\
\n\ \n\
This function is also available as \"hexlify()\"."); The return value is a bytes object. This function is also\n\
available as \"hexlify()\".");
static int static int