[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3
georg.brandl
python-checkins at python.org
Tue Oct 8 21:43:03 CEST 2013
http://hg.python.org/cpython/rev/a376ce037b60
changeset: 86157:a376ce037b60
parent: 86155:21f1b8fb9cbc
parent: 86156:9e976570a779
user: Georg Brandl <georg at python.org>
date: Tue Oct 08 21:43:46 2013 +0200
summary:
merge with 3.3
files:
Doc/library/exceptions.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -356,7 +356,7 @@
if it has another type (such as a string), the object's value is printed and
the exit status is one.
- Instances have an attribute :attr:`code` which is set to the proposed exit
+ Instances have an attribute :attr:`!code` which is set to the proposed exit
status or error message (defaulting to ``None``). Also, this exception derives
directly from :exc:`BaseException` and not :exc:`Exception`, since it is not
technically an error.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list