mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 87789-87790 via svnmerge from

Browse source 
svn+ssh://svn.python.org/python/branches/py3k

........
  r87789 | georg.brandl | 2011-01-06 10:23:56 +0100 (Do, 06 Jan 2011) | 1 line

  Fix various issues (mostly Python 2 relics) found by Jacques Ducasse.
........
  r87790 | georg.brandl | 2011-01-06 10:25:27 +0100 (Do, 06 Jan 2011) | 1 line

  Add acks where acks are due.
........
This commit is contained in:
Georg Brandl 2011-01-09 08:01:46 +00:00
parent 1caa644ffe
commit 41d0815a65
10 changed files with 48 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Doc/reference/compound_stmts.rst
View file

@ -285,12 +285,11 @@ keeping all locals in that frame alive until the next garbage collection occurs.
Before an except clause's suite is executed, details about the exception are
stored in the :mod:`sys` module and can be access via :func:`sys.exc_info`.
:func:`sys.exc_info` returns a 3-tuple consisting of: ``exc_type``, the
exception class; ``exc_value``, the exception instance; ``exc_traceback``, a
traceback object (see section :ref:`types`) identifying the point in the program
where the exception occurred. :func:`sys.exc_info` values are restored to their
previous values (before the call) when returning from a function that handled an
exception.
:func:`sys.exc_info` returns a 3-tuple consisting of the exception class, the
exception instance and a traceback object (see section :ref:`types`) identifying
the point in the program where the exception occurred. :func:`sys.exc_info`
values are restored to their previous values (before the call) when returning
from a function that handled an exception.
.. index::
keyword: else

6
Doc/reference/executionmodel.rst
View file

@ -141,9 +141,9 @@ weak form of restricted execution.
The namespace for a module is automatically created the first time a module is
imported. The main module for a script is always called :mod:`__main__`.
The global statement has the same scope as a name binding operation in the same
block. If the nearest enclosing scope for a free variable contains a global
statement, the free variable is treated as a global.
The :keyword:`global` statement has the same scope as a name binding operation
in the same block. If the nearest enclosing scope for a free variable contains
a global statement, the free variable is treated as a global.
A class definition is an executable statement that may use and define names.
These references follow the normal rules for name resolution. The namespace of