[Python-checkins] r86898 - in python/branches/release27-maint: Doc/library/os.rst Doc/library/parser.rst

Tue Nov 30 18:53:46 CET 2010

Author: eric.araujo
Date: Tue Nov 30 18:53:45 2010
New Revision: 86898
Log:
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.
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Doc/library/os.rst
 python/branches/release27-maint/Doc/library/parser.rst
Modified: python/branches/release27-maint/Doc/library/os.rst
==============================================================================

--- python/branches/release27-maint/Doc/library/os.rst	(original)
+++ python/branches/release27-maint/Doc/library/os.rst	Tue Nov 30 18:53:45 2010
@@ -1191,7 +1191,7 @@
 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.
Modified: python/branches/release27-maint/Doc/library/parser.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/parser.rst	(original)
+++ python/branches/release27-maint/Doc/library/parser.rst	Tue Nov 30 18:53:45 2010
@@ -273,7 +273,7 @@
 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.
