diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-04-29 04:59:19 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-04-29 04:59:19 (GMT) |
| commit | e9dcfd1870184ac4ac4c747e7ca4b9f9f32af6a1 (patch) | |
| tree | 3efec5a9768b9bfacaa322009ae6f6c643a2ae63 /Doc/reference | |
| parent | c763807d9bed84aeeb737c0e8ea1c238d59c99b6 (diff) | |
| parent | 7c895edabc0cf1d30061c929ca8c7fc2d45f0851 (diff) | |
| download | cpython-e9dcfd1870184ac4ac4c747e7ca4b9f9f32af6a1.zip cpython-e9dcfd1870184ac4ac4c747e7ca4b9f9f32af6a1.tar.gz cpython-e9dcfd1870184ac4ac4c747e7ca4b9f9f32af6a1.tar.bz2 | |
Merge with 3.4
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/compound_stmts.rst | 4 | ||||
| -rw-r--r-- | 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 index e35aa9f..4e03711 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -348,7 +348,9 @@ may be found in section :ref:`raise`. 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 index 799c323..c6c5e40 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -656,6 +656,8 @@ initializing the module, which includes execution of the module's code. 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 |