diff options
author | Georg Brandl <georg@python.org> | 2014-10-31 09:38:49 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2014-10-31 09:38:49 (GMT) |
commit | a4c8c47961305487ef6c40a6d882bb956f2c5a0b (patch) | |
tree | ade0c211dbcb38c39d91274d8ba6fdadd03bf8bc /Doc/reference/simple_stmts.rst | |
parent | 8ed75cd8e931c075c38246fbd50dd5f18defdba6 (diff) | |
download | cpython-a4c8c47961305487ef6c40a6d882bb956f2c5a0b.zip cpython-a4c8c47961305487ef6c40a6d882bb956f2c5a0b.tar.gz cpython-a4c8c47961305487ef6c40a6d882bb956f2c5a0b.tar.bz2 |
#22613: remaining corrections in extending/reference docs (thanks Jacques Ducasse)
Diffstat (limited to 'Doc/reference/simple_stmts.rst')
-rw-r--r-- | Doc/reference/simple_stmts.rst | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index 1748d5a..8946b4f 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -548,8 +548,8 @@ printed:: RuntimeError: Something bad happened A similar mechanism works implicitly if an exception is raised inside an -exception handler: the previous exception is then attached as the new -exception's :attr:`__context__` attribute:: +exception handler or a :keyword:`finally` clause: the previous exception is then +attached as the new exception's :attr:`__context__` attribute:: >>> try: ... print(1 / 0) @@ -731,10 +731,9 @@ in the module's namespace which do not begin with an underscore character to avoid accidentally exporting items that are not part of the API (such as library modules which were imported and used within the module). -The :keyword:`from` form with ``*`` may only occur in a module scope. The wild -card form of import --- ``from module import *`` --- is only allowed at the -module level. Attempting to use it in class or function definitions will raise -a :exc:`SyntaxError`. +The wild card form of import --- ``from module import *`` --- is only allowed at +the module level. Attempting to use it in class or function definitions will +raise a :exc:`SyntaxError`. .. index:: single: relative; import |