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 910291ff8f72cf4e8366c151a71096d51cb95c94..d5aa6fe3431a3f6970f60e681c72169ff7d4af09 100644 (file)
--- 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 b69d1b90dea269d71e5f5617b2e9bcf432d64f89..50b94c175060eb2386923d602d1dc4ecf5b01c00 100644 (file)
--- 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.