summaryrefslogtreecommitdiffstats
path: root/Doc/library/exceptions.rst
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2009-09-13 08:13:21 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2009-09-13 08:13:21 (GMT)
commit713e042152c3e554157293180f1407aea7446ae9 (patch)
tree39d8fe21e6d60787c61dfc28c85394d0a6428e58 /Doc/library/exceptions.rst
parentf388053649111e08ac213c0073cc60f02790351a (diff)
downloadcpython-713e042152c3e554157293180f1407aea7446ae9.zip
cpython-713e042152c3e554157293180f1407aea7446ae9.tar.gz
cpython-713e042152c3e554157293180f1407aea7446ae9.tar.bz2
Merged revisions 74764 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r74764 | ezio.melotti | 2009-09-13 10:54:02 +0300 (Sun, 13 Sep 2009) | 1 line fixed more examples that were using u"", print without () and unicode/str instead of str/bytes ........
Diffstat (limited to 'Doc/library/exceptions.rst')
-rw-r--r--Doc/library/exceptions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index feeeffd..17a0fed 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -52,7 +52,7 @@ The following exceptions are only used 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:`str` or :func:`unicode` is called on an instance of this class, the
+ :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. All arguments are stored in :attr:`args`
as a tuple.