diff options
author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-01-10 22:56:14 (GMT) |
---|---|---|
committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-01-10 22:56:14 (GMT) |
commit | 9971e001ef3aa41aa86528a36e038b1659c753c9 (patch) | |
tree | d2f31911ed7ef5544153920130608260f63eb67c | |
parent | 9a1383e380712667dc05963abd315ac3d33c0be4 (diff) | |
download | cpython-9971e001ef3aa41aa86528a36e038b1659c753c9.zip cpython-9971e001ef3aa41aa86528a36e038b1659c753c9.tar.gz cpython-9971e001ef3aa41aa86528a36e038b1659c753c9.tar.bz2 |
Issue #2568: Removed bogus rationale for supporting tm_sec=61.
-rw-r--r-- | Doc/library/datetime.rst | 15 | ||||
-rw-r--r-- | Doc/library/time.rst | 13 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index cad0eb4..2ace965 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1663,10 +1663,7 @@ format codes. The exact range of years for which :meth:`strftime` works also varies across platforms. Regardless of platform, years before 1000 cannot be -used with ``datetime`` module ``strftime()`` methods. The ``time`` -module ``strftime()`` function exibit different behavior depending on -the value of ``time.accept2dyear`` variable. See :ref:`Year 2000 -(Y2K) issues <time-y2kissues>` for details. +used with ``datetime`` module ``strftime()`` methods. +-----------+--------------------------------+-------+ | Directive | Meaning | Notes | @@ -1710,7 +1707,7 @@ the value of ``time.accept2dyear`` variable. See :ref:`Year 2000 | | AM or PM. | | +-----------+--------------------------------+-------+ | ``%S`` | Second as a decimal number | \(3) | -| | [00,61]. | | +| | [00,59]. | | +-----------+--------------------------------+-------+ | ``%U`` | Week number of the year | \(4) | | | (Sunday as the first day of | | @@ -1767,12 +1764,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 :mod:`time` module, :mod:`datetime` module does not support + leap seconds. (4) When used with the :meth:`strptime` method, ``%U`` and ``%W`` are only used in diff --git a/Doc/library/time.rst b/Doc/library/time.rst index dc6402c..28e994c 100644 --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -308,7 +308,7 @@ The module defines the following functions and data items: | ``%y`` | Year without century as a decimal number | | | | [00,99]. | | +-----------+------------------------------------------------+-------+ - | ``%Y`` | Year with century as a decimal number. | | + | ``%Y`` | Year with century as a decimal number. | \(4) | | | | | +-----------+------------------------------------------------+-------+ | ``%Z`` | Time zone name (no characters if no time zone | | @@ -324,13 +324,20 @@ The module defines the following functions and data items: the output hour field if the ``%I`` directive is used to parse the hour. (2) - The range really is ``0`` to ``61``; this accounts for leap seconds and the - (very rare) double leap seconds. + The range really is ``0`` to ``61``; value ``60`` is valid in + timestamps representing leap seconds and value ``61`` is supported + for historical reasons. (3) When used with the :func:`strptime` function, ``%U`` and ``%W`` are only used in calculations when the day of the week and the year are specified. + (4) + Produces different results depending on the value of + ``time.accept2dyear`` variable. See :ref:`Year 2000 (Y2K) + issues <time-y2kissues>` for details. + + Here is an example, a format for dates compatible with that specified in the :rfc:`2822` Internet email standard. [#]_ :: |