RetroSearch Browse

Tue Apr 29 07:00:17 CEST 2014 · http://mail.python.org/pipermail/python-checkins/2014-April/129793.html

http://hg.python.org/cpython/rev/3b9a03afed0e
changeset:   90502:3b9a03afed0e
parent:      90499:b82299695616
parent:      90501:9a0fc12991e2
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Apr 29 00:59:19 2014 -0400
summary:
  Merge with 3.4

files:
  Doc/reference/compound_stmts.rst |  4 +++-
  Doc/reference/simple_stmts.rst   |  2 ++
  2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -348,7 +348,9 @@
 The :keyword:`with` statement
 =============================
 
-.. index:: statement: with
+.. index::
+    statement: with
+    single: as; with statement
 
 The :keyword:`with` statement is used to wrap the execution of a block with
 methods defined by a context manager (see section :ref:`context-managers`).
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -656,6 +656,8 @@
 If the requested module is retrieved successfully, it will be made
 available in the local namespace in one of three ways:
 
+.. index:: single: as; import statement
+
 * If the module name is followed by :keyword:`as`, then the name
   following :keyword:`as` is bound directly to the imported module.
 * If no other name is specified, and the module being imported is a top

-- 
Repository URL: http://hg.python.org/cpython


Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from http://mail.python.org/pipermail/python-checkins/2014-April/129793.html below:

[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4