[Python-checkins] cpython (merge default -> default): Merge

[tim.golden]

http://hg.python.org/cpython/rev/fc1f353b8e7e
changeset:   86893:fc1f353b8e7e
parent:      86892:effad2bda4cb
parent:      86890:ac190d03aed5
user:        Tim Golden <mail at timgolden.me.uk>
date:        Sun Nov 03 18:27:07 2013 +0000
summary:
  Merge

files:
  Doc/library/binascii.rst |  2 +-
  Modules/binascii.c       |  3 ++-
  2 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst
--- a/Doc/library/binascii.rst
+++ b/Doc/library/binascii.rst
@@ -145,7 +145,7 @@
 
    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
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -1122,7 +1122,8 @@
 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

-- 
Repository URL: http://hg.python.org/cpython