diff options
| author | Tim Golden <mail@timgolden.me.uk> | 2013-11-03 18:27:07 (GMT) |
|---|---|---|
| committer | Tim Golden <mail@timgolden.me.uk> | 2013-11-03 18:27:07 (GMT) |
| commit | 7a07cc90c73b5a5587536c2f3fc5c2909b59be39 (patch) | |
| tree | 22968f7c07edbe7206b1bf4e2a7a9d7a53043e61 | |
| parent | 29641383716cb11ad7df18aaaa11586dd2495c70 (diff) | |
| parent | c3f57e4a35069200c3cd8e78e924c141c5ae222b (diff) | |
| download | cpython-7a07cc90c73b5a5587536c2f3fc5c2909b59be39.zip cpython-7a07cc90c73b5a5587536c2f3fc5c2909b59be39.tar.gz cpython-7a07cc90c73b5a5587536c2f3fc5c2909b59be39.tar.bz2 | |
Merge
| -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 386c2de..0f49701 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -1122,7 +1122,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 |