diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/includes/mp_distributing.py | 2 | ||||
| -rw-r--r-- | Doc/library/__future__.rst | 4 | ||||
| -rw-r--r-- | Doc/library/json.rst | 2 | ||||
| -rw-r--r-- | Doc/library/tarfile.rst | 5 | ||||
| -rw-r--r-- | Doc/library/turtle.rst | 6 | ||||
| -rw-r--r-- | Doc/library/unittest.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/simple_stmts.rst | 5 |
7 files changed, 18 insertions, 8 deletions
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 @@ 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 d6f82a3..b09246e 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/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 @@ 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 8ec7d86..8cf95dc 100644 --- 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 51490c4..64e8ac6 100644 --- 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 f40dba0..b7fb279 100644 --- 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 4be9875..dc8d2cf 100644 --- 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: |