From 54cc5fd72da2f056e01fac97b7e8d926b667660a Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sat, 25 Jun 2011 19:40:06 +0300 Subject: [PATCH 1/2] Use correct markup in zipimport.rst. Patch by Sara Magliacane. --- Doc/library/zipimport.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst index 2f0fa384afa..4f170924e96 100644 --- a/Doc/library/zipimport.rst +++ b/Doc/library/zipimport.rst @@ -9,11 +9,11 @@ This module adds the ability to import Python modules (:file:`\*.py`, :file:`\*.py[co]`) and packages from ZIP-format archives. It is usually not needed to use the :mod:`zipimport` module explicitly; it is automatically used -by the built-in :keyword:`import` mechanism for ``sys.path`` items that are paths +by the built-in :keyword:`import` mechanism for :data:`sys.path` items that are paths to ZIP archives. -Typically, ``sys.path`` is a list of directory names as strings. This module -also allows an item of ``sys.path`` to be a string naming a ZIP file archive. +Typically, :data:`sys.path` is a list of directory names as strings. This module +also allows an item of :data:`sys.path` to be a string naming a ZIP file archive. The ZIP archive can contain a subdirectory structure to support package imports, and a path within the archive can be specified to only import from a subdirectory. For example, the path :file:`/tmp/example.zip/lib/` would only From fc3db8a91ec2aa61810dc73c61543e0431d3267e Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sun, 26 Jun 2011 11:25:28 +0300 Subject: [PATCH 2/2] #11669: rephrase footnote in the Compound Statements page. --- Doc/reference/compound_stmts.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index d261574db4a..8151a0a3212 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -615,8 +615,9 @@ can be used to create instance variables with different implementation details. .. rubric:: Footnotes -.. [#] The exception is propagated to the invocation stack only if there is no - :keyword:`finally` clause that negates the exception. +.. [#] The exception is propagated to the invocation stack unless + there is a :keyword:`finally` clause which happens to raise another + exception. That new exception causes the old one to be lost. .. [#] Currently, control "flows off the end" except in the case of an exception or the execution of a :keyword:`return`, :keyword:`continue`, or