From: Éric Araujo Date: Tue, 30 Nov 2010 17:38:32 +0000 (+0000) Subject: Merged revisions 86892 via svnmerge from X-Git-Tag: v3.2.1b1~347^2~206 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d82a47ca26fad8babcf37c7b025b4fba4740f859;p=python Merged revisions 86892 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86892 | eric.araujo | 2010-11-30 18:20:31 +0100 (mar., 30 nov. 2010) | 2 lines Let’s keep “throw” for the generator method and use “raise” elsewhere. ........ --- diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 910291ff8f..d5aa6fe343 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1021,7 +1021,7 @@ Files and Directories single: UNC paths; and os.makedirs() Recursive directory creation function. Like :func:`mkdir`, but makes all - intermediate-level directories needed to contain the leaf directory. Throws + intermediate-level directories needed to contain the leaf directory. Raises an :exc:`error` exception if the leaf directory already exists or cannot be created. The default *mode* is ``0o777`` (octal). On some systems, *mode* is ignored. Where it is used, the current umask value is first masked out. diff --git a/Doc/library/parser.rst b/Doc/library/parser.rst index b69d1b90de..50b94c1750 100644 --- a/Doc/library/parser.rst +++ b/Doc/library/parser.rst @@ -269,7 +269,7 @@ function for information about the exceptions it can raise. will only need to be aware of the simple string values. Note that the functions :func:`compilest`, :func:`expr`, and :func:`suite` may -raise exceptions which are normally thrown by the parsing and compilation +raise exceptions which are normally raised by the parsing and compilation process. These include the built in exceptions :exc:`MemoryError`, :exc:`OverflowError`, :exc:`SyntaxError`, and :exc:`SystemError`. In these cases, these exceptions carry all the meaning normally associated with them.