diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-04-07 23:35:36 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-04-07 23:35:36 (GMT) |
commit | fa7e11f8c4ae652cbd533b78ac95c0582e03e7c5 (patch) | |
tree | 78d5b20a53e6d735e15a4da290b65c80360f6718 | |
parent | 7b2262fe78b3dff8c986d0bfe942a4defbd973f0 (diff) | |
parent | 222ef828277f99dc6234f1421bf40724cd9167f8 (diff) | |
download | cpython-fa7e11f8c4ae652cbd533b78ac95c0582e03e7c5.zip cpython-fa7e11f8c4ae652cbd533b78ac95c0582e03e7c5.tar.gz cpython-fa7e11f8c4ae652cbd533b78ac95c0582e03e7c5.tar.bz2 |
merge 3.4 (#21174)
-rw-r--r-- | Doc/library/exceptions.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst index 329fdd5..0642a13 100644 --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -161,7 +161,7 @@ The following exceptions are the exceptions that are usually raised. .. exception:: GeneratorExit - Raise when a :term:`generator`\'s :meth:`close` method is called. It + Raised when a :term:`generator`\'s :meth:`close` method is called. It directly inherits from :exc:`BaseException` instead of :exc:`Exception` since it is technically not an error. |