[Python-checkins] r72071 - in python/branches/release26-maint: Doc/includes/mp_distributing.py Doc/library/__future__.rst Doc/library/functions.rst Doc/library/json.rst Doc/library/tarfile.rst Doc/library/threading.rst Doc/library/turtle.rst Doc/reference/simple_stmts.rst
georg.brandl
python-checkins at python.org
Tue Apr 28 20:18:54 CEST 2009
Author: georg.brandl
Date: Tue Apr 28 20:18:53 2009
New Revision: 72071
Log:
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Doc/includes/mp_distributing.py
python/branches/release26-maint/Doc/library/__future__.rst
python/branches/release26-maint/Doc/library/functions.rst
python/branches/release26-maint/Doc/library/json.rst
python/branches/release26-maint/Doc/library/tarfile.rst
python/branches/release26-maint/Doc/library/threading.rst
python/branches/release26-maint/Doc/library/turtle.rst
python/branches/release26-maint/Doc/reference/simple_stmts.rst
Modified: python/branches/release26-maint/Doc/includes/mp_distributing.py
==============================================================================
--- python/branches/release26-maint/Doc/includes/mp_distributing.py (original)
+++ python/branches/release26-maint/Doc/includes/mp_distributing.py Tue Apr 28 20:18:53 2009
@@ -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()
Modified: python/branches/release26-maint/Doc/library/__future__.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/__future__.rst (original)
+++ python/branches/release26-maint/Doc/library/__future__.rst Tue Apr 28 20:18:53 2009
@@ -58,3 +58,7 @@
No feature description will ever be deleted from :mod:`__future__`.
+.. seealso::
+
+ :ref:`future`
+ How the compiler treats future imports.
Modified: python/branches/release26-maint/Doc/library/functions.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/functions.rst (original)
+++ python/branches/release26-maint/Doc/library/functions.rst Tue Apr 28 20:18:53 2009
@@ -815,7 +815,7 @@
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
Modified: python/branches/release26-maint/Doc/library/json.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/json.rst (original)
+++ python/branches/release26-maint/Doc/library/json.rst Tue Apr 28 20:18:53 2009
@@ -174,7 +174,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
Modified: python/branches/release26-maint/Doc/library/tarfile.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/tarfile.rst (original)
+++ python/branches/release26-maint/Doc/library/tarfile.rst Tue Apr 28 20:18:53 2009
@@ -384,8 +384,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)
Modified: python/branches/release26-maint/Doc/library/threading.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/threading.rst (original)
+++ python/branches/release26-maint/Doc/library/threading.rst Tue Apr 28 20:18:53 2009
@@ -555,12 +555,12 @@
.. 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
Modified: python/branches/release26-maint/Doc/library/turtle.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/turtle.rst (original)
+++ python/branches/release26-maint/Doc/library/turtle.rst Tue Apr 28 20:18:53 2009
@@ -1244,9 +1244,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
Modified: python/branches/release26-maint/Doc/reference/simple_stmts.rst
==============================================================================
--- python/branches/release26-maint/Doc/reference/simple_stmts.rst (original)
+++ python/branches/release26-maint/Doc/reference/simple_stmts.rst Tue Apr 28 20:18:53 2009
@@ -907,6 +907,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:
More information about the Python-checkins
mailing list