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 ef1e862dd7ceb51ae18980a920081e771720e3bc..9a888255e41c74f3461de4e3e6a913f9a2b84729 100644 (file)
--- a/Doc/includes/mp_distributing.py
+++ b/Doc/includes/mp_distributing.py
@@ -38,7 +38,7 @@ def get_logger():
     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 d6f82a321707731d5da6b08d498b8904a6e8d45f..b09246ef09c4f9acec8bc3b888806bdf834cfb66 100644 (file)
--- a/Doc/library/__future__.rst
+++ b/Doc/library/__future__.rst
@@ -58,3 +58,7 @@ attribute on :class:`_Feature` instances.
 
 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 e2d189c58147e6f0deedf7578135e13268adbd72..3275b4a39d82e5dff4d151f98f96f81dee21017b 100644 (file)
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -173,7 +173,7 @@ Basic Usage
    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 8ec7d86d46036215d8135954bdc13152229d6ebe..8cf95dc0f96c50389710a8c160e52405e40e787a 100644 (file)
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -352,8 +352,9 @@ object, see :ref:`tarinfo-objects` for details.
 
    .. 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 51490c4f66eb9b38daa60025ced11d212ec7172a..64e8ac60ef09ec3ade6ebe5190f7c785f6f98111 100644 (file)
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -1220,9 +1220,9 @@ Window control
 
 .. 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 f40dba040d54e7a10e0178c72af672e6fceed6ae..b7fb2795d4d04522f0db93f93673da2498b422bb 100644 (file)
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -608,7 +608,7 @@ Test cases
                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 4be98751ef1400ae5d0196aaae4563395141a620..dc8d2cf60dc649ce985e02df4891df957f14d789 100644 (file)
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -897,6 +897,11 @@ for the rest of the interpreter session.  If an interpreter is started with the
 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: