traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some issues found by Jacques Ducasse on the docs list.

This commit is contained in:
Georg Brandl 2010-03-21 09:02:59 +00:00
parent f8754a60a8
commit 482b151caf
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Doc/library/sys.rst
View File

@ -127,13 +127,12 @@ always available.
.. index:: object: traceback .. index:: object: traceback
If no exception is being handled anywhere on the stack, a tuple containing three If no exception is being handled anywhere on the stack, a tuple containing
``None`` values is returned. Otherwise, the values returned are ``(type, value, three ``None`` values is returned. Otherwise, the values returned are
traceback)``. Their meaning is: *type* gets the exception type of the exception ``(type, value, traceback)``. Their meaning is: *type* gets the type of the
being handled (a class object); *value* gets the exception parameter (its exception being handled (a subclass of :exc:`BaseException`); *value* gets
:dfn:`associated value` or the second argument to :keyword:`raise`, which is the exception instance (an instance of the exception type); *traceback* gets
always a class instance if the exception type is a class object); *traceback* a traceback object (see the Reference Manual) which encapsulates the call
gets a traceback object (see the Reference Manual) which encapsulates the call
stack at the point where the exception originally occurred. stack at the point where the exception originally occurred.
.. warning:: .. warning::
@ -508,9 +507,7 @@ always available.
more information.) more information.)
The meaning of the variables is the same as that of the return values from The meaning of the variables is the same as that of the return values from
:func:`exc_info` above. (Since there is only one interactive thread, :func:`exc_info` above.
thread-safety is not a concern for these variables, unlike for ``exc_type``
etc.)
.. data:: maxsize .. data:: maxsize

8
Doc/reference/simple_stmts.rst
View File

@ -146,16 +146,12 @@ Assignment of an object to a single target is recursively defined as follows.
* Otherwise: the name is bound to the object in the global namespace or the * Otherwise: the name is bound to the object in the global namespace or the
outer namespace determined by :keyword:`nonlocal`, respectively. outer namespace determined by :keyword:`nonlocal`, respectively.
.. index:: single: destructor
The name is rebound if it was already bound. This may cause the reference The name is rebound if it was already bound. This may cause the reference
count for the object previously bound to the name to reach zero, causing the count for the object previously bound to the name to reach zero, causing the
object to be deallocated and its destructor (if it has one) to be called. object to be deallocated and its destructor (if it has one) to be called.
.. index:: single: destructor
The name is rebound if it was already bound. This may cause the reference count
for the object previously bound to the name to reach zero, causing the object to
be deallocated and its destructor (if it has one) to be called.
* If the target is a target list enclosed in parentheses or in square brackets: * If the target is a target list enclosed in parentheses or in square brackets:
The object must be an iterable with the same number of items as there are The object must be an iterable with the same number of items as there are
targets in the target list, and its items are assigned, from left to right, targets in the target list, and its items are assigned, from left to right,