Merged revisions 71814-71817,71901-71903 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71814 | georg.brandl | 2009-04-23 10:44:57 +0200 (Do, 23 Apr 2009) | 1 line
#5820: fix bug in usage of getreader().
........
r71815 | georg.brandl | 2009-04-23 10:49:39 +0200 (Do, 23 Apr 2009) | 1 line
Fix rewrapping accident.
........
r71816 | georg.brandl | 2009-04-23 10:49:56 +0200 (Do, 23 Apr 2009) | 1 line
#5813: add a reference to the "future statements" section.
........
r71817 | georg.brandl | 2009-04-23 10:52:03 +0200 (Do, 23 Apr 2009) | 1 line
Add link to PEP 236.
........
r71901 | georg.brandl | 2009-04-25 16:50:25 +0200 (Sa, 25 Apr 2009) | 1 line
#3320: fix spelling.
........
r71902 | georg.brandl | 2009-04-25 16:51:31 +0200 (Sa, 25 Apr 2009) | 1 line
#5834: use "failure" instead of "error" because the two have different meanings in unittest context.
........
r71903 | georg.brandl | 2009-04-25 17:05:04 +0200 (Sa, 25 Apr 2009) | 1 line
#5821: add some capabilities of TarFile's file-like object.
........
diff --git a/Doc/includes/mp_distributing.py b/Doc/includes/mp_distributing.py
index ef1e862..9a88825 100644
--- a/Doc/includes/mp_distributing.py
+++ b/Doc/includes/mp_distributing.py
@@ -38,7 +38,7 @@
return _logger
_logger = logging.getLogger('distributing')
-_logger.propogate = 0
+_logger.propagate = 0
_formatter = logging.Formatter(util.DEFAULT_LOGGING_FORMAT)
_handler = logging.StreamHandler()
diff --git a/Doc/library/__future__.rst b/Doc/library/__future__.rst
index d6f82a3..b09246e 100644
--- a/Doc/library/__future__.rst
+++ b/Doc/library/__future__.rst
@@ -58,3 +58,7 @@
No feature description will ever be deleted from :mod:`__future__`.
+.. seealso::
+
+ :ref:`future`
+ How the compiler treats future imports.
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index e2d189c..3275b4a 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -173,7 +173,7 @@
If the contents of *fp* are encoded with an ASCII based encoding other than
UTF-8 (e.g. latin-1), then an appropriate *encoding* name must be specified.
Encodings that are not ASCII based (such as UCS-2) are not allowed, and
- should be wrapped with ``codecs.getreader(fp)(encoding)``, or simply decoded
+ should be wrapped with ``codecs.getreader(encoding)(fp)``, or simply decoded
to a :class:`unicode` object and passed to :func:`loads`.
*object_hook* is an optional function that will be called with the result of
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index 8ec7d86..8cf95dc 100644
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -352,8 +352,9 @@
.. note::
- The file-like object is read-only and provides the following methods:
- :meth:`read`, :meth:`readline`, :meth:`readlines`, :meth:`seek`, :meth:`tell`.
+ The file-like object is read-only. It provides the methods
+ :meth:`read`, :meth:`readline`, :meth:`readlines`, :meth:`seek`, :meth:`tell`,
+ and :meth:`close`, and also supports iteration over its lines.
.. method:: TarFile.add(name, arcname=None, recursive=True, exclude=None)
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 51490c4..64e8ac6 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -1220,9 +1220,9 @@
.. function:: screensize(canvwidth=None, canvheight=None, bg=None)
- :param canvwidth: positive integer, new width of canvas in pixels :param
- canvheight: positive integer, new height of canvas in pixels :param bg:
- colorstring or color-tuple, new background color
+ :param canvwidth: positive integer, new width of canvas in pixels
+ :param canvheight: positive integer, new height of canvas in pixels
+ :param bg: colorstring or color-tuple, new background color
If no arguments are given, return current (canvaswidth, canvasheight). Else
resize the canvas the turtles are drawing on. Do not alter the drawing
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index f40dba0..b7fb279 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -608,7 +608,7 @@
assert_(expr[, msg])
failUnless(expr[, msg])
- Signal a test failure if *expr* is false; the explanation for the error
+ Signal a test failure if *expr* is false; the explanation for the failure
will be *msg* if given, otherwise it will be :const:`None`.
.. deprecated:: 3.1
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index 4be9875..dc8d2cf 100644
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -897,6 +897,11 @@
a future statement, it will be in effect in the interactive session started
after the script is executed.
+.. seealso::
+
+ :pep:`236` - Back to the __future__
+ The original proposal for the __future__ mechanism.
+
.. _global: