[Python-checkins] r70398 - in python/branches/py3k: Doc/reference/executionmodel.rst

[georg.brandl]

Author: georg.brandl
Date: Sun Mar 15 22:57:20 2009
New Revision: 70398

Log:
Merged revisions 70397 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70397 | georg.brandl | 2009-03-15 22:53:56 +0100 (So, 15 Mär 2009) | 1 line
  
  #5469: add with statement to list of name-binding constructs.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/reference/executionmodel.rst

Modified: python/branches/py3k/Doc/reference/executionmodel.rst
==============================================================================
--- python/branches/py3k/Doc/reference/executionmodel.rst	(original)
+++ python/branches/py3k/Doc/reference/executionmodel.rst	Sun Mar 15 22:57:20 2009
@@ -86,9 +86,10 @@
 The following constructs bind names: formal parameters to functions,
 :keyword:`import` statements, class and function definitions (these bind the
 class or function name in the defining block), and targets that are identifiers
-if occurring in an assignment, :keyword:`for` loop header, or in the second
-position of an :keyword:`except` clause header.  The :keyword:`import` statement
-of the form "``from ...import *``" binds all names defined in the imported
+if occurring in an assignment, :keyword:`for` loop header, or after
+:keyword:`as` in a :keyword:`with` statement or :keyword.`except` clause.
+The :keyword:`import` statement
+of the form ``from ... import *`` binds all names defined in the imported
 module, except those beginning with an underscore.  This form may only be used
 at the module level.