diff options
author | Éric Araujo <merwok@netwok.org> | 2010-11-30 17:53:45 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2010-11-30 17:53:45 (GMT) |
commit | 4c8d6b6126f19e7630306577ee6a6522d9512b93 (patch) | |
tree | b16a0972b2e99fce899fcf4eb2570fe27490d59b /Doc/library | |
parent | acdafa8e8cd180dcf206691cce94e12438d8f4ac (diff) | |
download | cpython-4c8d6b6126f19e7630306577ee6a6522d9512b93.zip cpython-4c8d6b6126f19e7630306577ee6a6522d9512b93.tar.gz cpython-4c8d6b6126f19e7630306577ee6a6522d9512b93.tar.bz2 |
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.
........
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/os.rst | 2 | ||||
-rw-r--r-- | Doc/library/parser.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 194a0c4..7378d2e 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1191,7 +1191,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 an + 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 ``0777`` (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 9049c82..c46aeae 100644 --- a/Doc/library/parser.rst +++ b/Doc/library/parser.rst @@ -273,7 +273,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. |