From a80d3a09fd10ab27795b15d052d05e5dc50d42bc Mon Sep 17 00:00:00 2001 From: David Wolever <david@wolever.net> Date: Wed, 14 Aug 2013 14:33:54 -0400 Subject: [PATCH] Issue #18718: datetime documentation contradictory on leap second support --- Doc/library/datetime.rst | 10 +++------- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index be41e1210db..4e922f03a08 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1664,7 +1664,7 @@ platforms. Regardless of platform, years before 1900 cannot be used. | ``%M`` | Minute as a zero-padded | 00, 01, ..., 59 | | | | decimal number. | | | +-----------+--------------------------------+------------------------+-------+ -| ``%S`` | Second as a zero-padded | 00, 01, ..., 61 | \(3) | +| ``%S`` | Second as a zero-padded | 00, 01, ..., 59 | \(3) | | | decimal number. | | | +-----------+--------------------------------+------------------------+-------+ | ``%f`` | Microsecond as a decimal | 000000, 000001, ..., | \(4) | @@ -1728,12 +1728,8 @@ Notes: the output hour field if the ``%I`` directive is used to parse the hour. (3) - The range really is ``0`` to ``61``; according to the Posix standard this - accounts for leap seconds and the (very rare) double leap seconds. - The :mod:`time` module may produce and does accept leap seconds since - it is based on the Posix standard, but the :mod:`datetime` module - does not accept leap seconds in :meth:`strptime` input nor will it - produce them in :func:`strftime` output. + Unlike the :mod:`time` module, the :mod:`datetime` module does not support + leap seconds. (4) ``%f`` is an extension to the set of format characters in the C standard diff --git a/Misc/NEWS b/Misc/NEWS index d2d3b08a2ac..2aad9bbd066 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -166,7 +166,10 @@ Tests Documentation ------------- +- Issue #18718: datetime documentation contradictory on leap second support. + - Issue #17701: Improving strftime documentation. + - Issue #17844: Refactor a documentation of Python specific encodings. Add links to encoders and decoders for binary-to-binary codecs. -- 2.30.9