diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-11-03 18:21:38 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-11-03 18:21:38 (GMT) |
| commit | 5fdb64b5a0a8567a232c2182f0c0439872c987e2 (patch) | |
| tree | 6f31f22488b183aa2e3656ec85538e0d624433d4 | |
| parent | 0de4d3e3eb348d9bfc6df1d7c0651b309306863c (diff) | |
| download | cpython-5fdb64b5a0a8567a232c2182f0c0439872c987e2.zip cpython-5fdb64b5a0a8567a232c2182f0c0439872c987e2.tar.gz cpython-5fdb64b5a0a8567a232c2182f0c0439872c987e2.tar.bz2 | |
#19411: Clarify that b2a_hex/hexlify returns a bytes object.
Initial patch by Vajrasky Kok.
| -rw-r--r-- | Doc/library/binascii.rst | 2 | ||||
| -rw-r--r-- | Modules/binascii.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst index 02ec5d8..c92a8e1 100644 --- a/Doc/library/binascii.rst +++ b/Doc/library/binascii.rst @@ -145,7 +145,7 @@ The :mod:`binascii` module defines the following functions: Return the hexadecimal representation of the binary *data*. Every byte of *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) diff --git a/Modules/binascii.c b/Modules/binascii.c index 340ec9c..a84badc7 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -1129,7 +1129,8 @@ binascii_hexlify(PyObject *self, PyObject *args) PyDoc_STRVAR(doc_hexlify, "b2a_hex(data) -> s; Hexadecimal representation of binary data.\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 |