Commit d82a47ca authored by Éric Araujo's avatar Éric Araujo

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.
........
parent 3d9ab4d7
...@@ -1021,7 +1021,7 @@ Files and Directories ...@@ -1021,7 +1021,7 @@ Files and Directories
single: UNC paths; and os.makedirs() single: UNC paths; and os.makedirs()
Recursive directory creation function. Like :func:`mkdir`, but makes all 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 an :exc:`error` exception if the leaf directory already exists or cannot be
created. The default *mode* is ``0o777`` (octal). On some systems, *mode* 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. is ignored. Where it is used, the current umask value is first masked out.
......
...@@ -269,7 +269,7 @@ function for information about the exceptions it can raise. ...@@ -269,7 +269,7 @@ function for information about the exceptions it can raise.
will only need to be aware of the simple string values. will only need to be aware of the simple string values.
Note that the functions :func:`compilest`, :func:`expr`, and :func:`suite` may 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`, process. These include the built in exceptions :exc:`MemoryError`,
:exc:`OverflowError`, :exc:`SyntaxError`, and :exc:`SystemError`. In these :exc:`OverflowError`, :exc:`SyntaxError`, and :exc:`SystemError`. In these
cases, these exceptions carry all the meaning normally associated with them. cases, these exceptions carry all the meaning normally associated with them.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment