summaryrefslogtreecommitdiff
path: root/Doc
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2011-11-22 22:02:01 +0100
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2011-11-22 22:02:01 +0100
commit942d5ba125860112c42f3a8981778c80c23d5499 (patch)
tree142f9ed4e3e83cee234402d0be2ca9d28839acd8 /Doc
parent02686751931e6cd267f60c65b59744c7dff50cd2 (diff)
parent5e8f8104116edfcbfee2690a58391830bd9883ae (diff)
downloadcpython-git-942d5ba125860112c42f3a8981778c80c23d5499.tar.gz
Merge branch 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/exceptions.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index ca8e4d8b6d..49cec1ec0c 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -44,9 +44,9 @@ The following exceptions are used mostly as base classes for other exceptions.
The base class for all built-in exceptions. It is not meant to be directly
inherited by user-defined classes (for that, use :exc:`Exception`). If
- :func:`bytes` or :func:`str` is called on an instance of this class, the
- representation of the argument(s) to the instance are returned, or the empty
- string when there were no arguments.
+ :func:`str` is called on an instance of this class, the representation of
+ the argument(s) to the instance are returned, or the empty string when
+ there were no arguments.
.. attribute:: args