diff options
| author | Georg Brandl <georg@python.org> | 2009-10-27 20:23:20 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-10-27 20:23:20 (GMT) |
| commit | 1e8cbe36cc2455296d38f927d1ab54b93d894881 (patch) | |
| tree | 2ed1df8c9dd684a27793897c2cf542cf0111e269 /Doc/reference | |
| parent | cb7cb247b32acdd0816663d35ad51057a8571894 (diff) | |
| download | cpython-1e8cbe36cc2455296d38f927d1ab54b93d894881.zip cpython-1e8cbe36cc2455296d38f927d1ab54b93d894881.tar.gz cpython-1e8cbe36cc2455296d38f927d1ab54b93d894881.tar.bz2 | |
Merged revisions 75393,75416,75581,75609,75615 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r75393 | georg.brandl | 2009-10-13 18:55:12 +0200 (Di, 13 Okt 2009) | 1 line
Update module names in references in the FAQ.
................
r75416 | georg.brandl | 2009-10-14 20:46:15 +0200 (Mi, 14 Okt 2009) | 1 line
#7129: add missing function.
................
r75581 | georg.brandl | 2009-10-21 09:17:48 +0200 (Mi, 21 Okt 2009) | 9 lines
Merged revisions 75580 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75580 | georg.brandl | 2009-10-21 09:15:59 +0200 (Mi, 21 Okt 2009) | 1 line
#7170: fix explanation about non-weakrefable builtin types.
........
................
r75609 | georg.brandl | 2009-10-22 17:16:26 +0200 (Do, 22 Okt 2009) | 1 line
#7137: fix makefile() documentation to match the new parameters.
................
r75615 | georg.brandl | 2009-10-22 18:08:10 +0200 (Do, 22 Okt 2009) | 1 line
#6927: fix wrong word.
................
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/compound_stmts.rst | 6 | ||||
| -rw-r--r-- | Doc/reference/datamodel.rst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index 016ccbb..b2eef16 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -608,9 +608,9 @@ which is then bound to the class name. .. [#] The exception is propagated to the invocation stack only if there is no :keyword:`finally` clause that negates the exception. -.. [#] Currently, control "flows off the end" except in the case of an exception or the - execution of a :keyword:`return`, :keyword:`continue`, or :keyword:`break` - statement. +.. [#] Currently, control "flows off the end" except in the case of an exception + or the execution of a :keyword:`return`, :keyword:`continue`, or + :keyword:`break` statement. .. [#] A string literal appearing as the first statement in the function body is transformed into the function's ``__doc__`` attribute and therefore the diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index e3abeb7..971c06e 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1532,7 +1532,7 @@ returning an ordered dictionary. The appropriate metaclass is determined by the following precedence rules: -* If the ``metaclass`` keyword argument is based with the bases, it is used. +* If the ``metaclass`` keyword argument is passed with the bases, it is used. * Otherwise, if there is at least one base class, its metaclass is used. |