diff options
| -rw-r--r-- | Doc/includes/mp_distributing.py | 2 | ||||
| -rw-r--r-- | Doc/library/__future__.rst | 4 | ||||
| -rw-r--r-- | Doc/library/functions.rst | 2 | ||||
| -rw-r--r-- | Doc/library/json.rst | 2 | ||||
| -rw-r--r-- | Doc/library/tarfile.rst | 5 | ||||
| -rw-r--r-- | Doc/library/threading.rst | 10 | ||||
| -rw-r--r-- | Doc/library/turtle.rst | 6 | ||||
| -rw-r--r-- | Doc/reference/simple_stmts.rst | 5 |
8 files changed, 23 insertions, 13 deletions
diff --git a/Doc/includes/mp_distributing.py b/Doc/includes/mp_distributing.py index 43c7ad13a9..063fef9cba 100644 --- 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 d6f82a3217..b09246ef09 100644 --- 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 70db1d863d..547439ac07 100644 --- 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 8a644af823..a07dd3bf08 100644 --- 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 aabd6410bf..29968396e0 100644 --- 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 69593ae7b1..91f6550744 100644 --- 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 bf567a2cb1..a0c7694aa3 100644 --- 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 6ae031739f..beb4623bf2 100644 --- 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: |