Merged revisions 71786-71787,71814-71817,71901-71903 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71786 | georg.brandl | 2009-04-21 20:23:08 +0200 (Di, 21 Apr 2009) | 1 line

  #5757: fix copy-paste error in notify().
........
  r71787 | georg.brandl | 2009-04-21 20:24:34 +0200 (Di, 21 Apr 2009) | 1 line

  #5751: fix escaping of \\n.
........
  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 43c7ad13a9feb4c3dceb4950d8702af5b8d94be5..063fef9cba85fe81b0a877a0fb16e29b86284b91 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/functions.rst b/Doc/library/functions.rst
index 70db1d863def3b6d701b385f6d12cacc3381db19..547439ac070852ce573121299018629fc373c3ee 100644 (file)
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -815,7 +815,7 @@ available.  They are listed here in alphabetical order.
    accidents.)
 
 
-.. function:: print([object, ...][, sep=' '][, end='\n'][, file=sys.stdout])
+.. function:: print([object, ...][, sep=' '][, end='\\n'][, file=sys.stdout])
 
    Print *object*\(s) to the stream *file*, separated by *sep* and followed by
    *end*.  *sep*, *end* and *file*, if present, must be given as keyword

diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index 8a644af823bc147346b5a023ab3b9ace393d1039..a07dd3bf083c81c2654cfa0f2c41d00fc935c9dd 100644 (file)
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -174,7 +174,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 aabd6410bffe8e2a6fd5750d8be2d457f9b2f924..29968396e01a76e16410032fc268781f701496da 100644 (file)
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -384,8 +384,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/threading.rst b/Doc/library/threading.rst
index 69593ae7b1fd627ffcff3e055d0f3ebfb0bb1738..91f65507440a540ce8daa06d3852e259807edfc7 100644 (file)
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -555,12 +555,12 @@ needs to wake up one consumer thread.
 
 .. method:: Condition.notify()
 
-   Wake up a thread waiting on this condition, if any. Wait until notified or until
-   a timeout occurs. If the calling thread has not acquired the lock when this
-   method is called, a :exc:`RuntimeError` is raised.
+   Wake up a thread waiting on this condition, if any.  If the calling thread
+   has not acquired the lock when this method is called, a :exc:`RuntimeError`
+   is raised.
 
-   This method wakes up one of the threads waiting for the condition variable, if
-   any are waiting; it is a no-op if no threads are waiting.
+   This method wakes up one of the threads waiting for the condition variable,
+   if any are waiting; it is a no-op if no threads are waiting.
 
    The current implementation wakes up exactly one thread, if any are waiting.
    However, it's not safe to rely on this behavior.  A future, optimized

diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index bf567a2cb10a8a4b594ade158ef1e337703418f4..a0c7694aa30918563c77fb000e6fe11d74426fb8 100644 (file)
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -1244,9 +1244,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/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index 6ae031739fe393e291e8872429375eb87e9edbdf..beb4623bf2f69a9a5a4fd145aba32708ac121e77 100644 (file)
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -907,6 +907,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: