Merge branch 'master' into test-support-double-rounding

Author: skirpichev

Doc/library/difflib.rst

@@ -728,18 +728,16 @@ Finally, we compare the two:
 
    >>> from pprint import pprint
    >>> pprint(result)
-   [
-       '    1. Beautiful is better than ugly.\n',
-       '-   2. Explicit is better than implicit.\n',
-       '-   3. Simple is better than complex.\n',
-       '+   3.   Simple is better than complex.\n',
-       '?     ++\n',
-       '-   4. Complex is better than complicated.\n',
-       '?            ^                     ---- ^\n',
-       '+   4. Complicated is better than complex.\n',
-       '?           ++++ ^                      ^\n',
-       '+   5. Flat is better than nested.\n',
-   ]
+   ['    1. Beautiful is better than ugly.\n',
+    '-   2. Explicit is better than implicit.\n',
+    '-   3. Simple is better than complex.\n',
+    '+   3.   Simple is better than complex.\n',
+    '?     ++\n',
+    '-   4. Complex is better than complicated.\n',
+    '?            ^                     ---- ^\n',
+    '+   4. Complicated is better than complex.\n',
+    '?           ++++ ^                      ^\n',
+    '+   5. Flat is better than nested.\n']
 
 As a single multi-line string it looks like this:
 

Doc/library/gzip.rst

@@ -28,7 +28,7 @@ Note that additional file formats which can be decompressed by the
 The module defines the following items:
 
 
-.. function:: open(filename, mode='rb', compresslevel=6, encoding=None, errors=None, newline=None)
+.. function:: open(filename, mode='rb', compresslevel=6, encoding=None, errors=None, newline=None, *, mtime=None)
 
    Open a gzip-compressed file in binary or text mode, returning a :term:`file
    object`.
@@ -43,9 +43,12 @@ The module defines the following items:
    The *compresslevel* argument is an integer from 0 to 9, as for the
    :class:`GzipFile` constructor.
 
+   The keyword-only argument *mtime* represents a Unix timestamp.
+
    For binary mode, this function is equivalent to the :class:`GzipFile`
-   constructor: ``GzipFile(filename, mode, compresslevel)``. In this case, the
-   *encoding*, *errors* and *newline* arguments must not be provided.
+   constructor: ``GzipFile(filename, mode, compresslevel, mtime=mtime)``.
+   In this case, the *encoding*, *errors* and *newline* arguments must not
+   be provided.
 
    For text mode, a :class:`GzipFile` object is created, and wrapped in an
    :class:`io.TextIOWrapper` instance with the specified encoding, error
@@ -66,6 +69,10 @@ The module defines the following items:
       It is the default level used by most compression tools and a better
       tradeoff between speed and performance.
 
+   .. versionchanged:: next
+      Added keyword-only argument *mtime* which is passed to the class
+      constructor of :class:`~gzip.GzipFile`.
+
 .. exception:: BadGzipFile
 
    An exception raised for invalid gzip files.  It inherits from :exc:`OSError`.
@@ -108,9 +115,13 @@ The module defines the following items:
    is no compression. The default is ``9``.
 
    The optional *mtime* argument is the timestamp requested by gzip. The time
-   is in Unix format, i.e., seconds since 00:00:00 UTC, January 1, 1970.
-   If *mtime* is omitted or ``None``, the current time is used. Use *mtime* = 0
-   to generate a compressed stream that does not depend on creation time.
+   is in Unix format, i.e., seconds since 00:00:00 UTC, January 1, 1970. Set
+   *mtime* to ``0`` to generate a compressed stream that does not depend on
+   creation time. If *mtime* is omitted or ``None``, the current time is used;
+   however, if the current time is outside the range 00:00:00 UTC, January 1,
+   1970 through 06:28:15 UTC, February 7, 2106, or explicitly passed *mtime*
+   argument is outside the range ``0`` to ``2**32-1``, then the value ``0``
+   is used instead.
 
    See below for the :attr:`mtime` attribute that is set when decompressing.