diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-05-29 00:56:02 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-05-29 00:56:02 (GMT) |
| commit | 82069612ec2f1273c7061e099e70bb86bf66e97a (patch) | |
| tree | e65026a5fe150508822842a80e5e69a46e517116 /Doc/library/binascii.rst | |
| parent | cb433a0a78a2a9e6befc5978a4588e938582b115 (diff) | |
| parent | 58dd7648dede087f1f3cbedd70cd095ba9f1a381 (diff) | |
| download | cpython-82069612ec2f1273c7061e099e70bb86bf66e97a.zip cpython-82069612ec2f1273c7061e099e70bb86bf66e97a.tar.gz cpython-82069612ec2f1273c7061e099e70bb86bf66e97a.tar.bz2 | |
Issue #27124: Merge binascii doc from 3.5
Diffstat (limited to 'Doc/library/binascii.rst')
| -rw-r--r-- | Doc/library/binascii.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst index 77f2c46..f92f6df 100644 --- a/Doc/library/binascii.rst +++ b/Doc/library/binascii.rst @@ -152,8 +152,8 @@ The :mod:`binascii` module defines the following functions: Return the binary data represented by the hexadecimal string *hexstr*. This function is the inverse of :func:`b2a_hex`. *hexstr* must contain an even number - of hexadecimal digits (which can be upper or lower case), otherwise a - :exc:`TypeError` is raised. + of hexadecimal digits (which can be upper or lower case), otherwise an + :exc:`Error` exception is raised. .. exception:: Error |