diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-01-14 15:59:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-14 15:59:20 -0800 |
| commit | 93dc1654dc3c925c062e19f0ef8587aa8961ef8a (patch) | |
| tree | 09e6c84ec3e740f93f67b304c102587e4cab6b59 | |
| parent | 30300f41134257d2be377286ff09b35eb4a72068 (diff) | |
| download | cpython-git-93dc1654dc3c925c062e19f0ef8587aa8961ef8a.tar.gz | |
bpo-20281, bpo-29964: update datetime docs to refer %z and %Z to a pre-existing footnote (GH-30354)
(cherry picked from commit 305588c67cdede4ef127ada90c1557bc1ef7c200)
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
| -rw-r--r-- | Doc/library/time.rst | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Doc/library/time.rst b/Doc/library/time.rst index cfd67e8750..735588a17e 100644 --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -456,10 +456,10 @@ Functions | | negative time difference from UTC/GMT of the | | | | form +HHMM or -HHMM, where H represents decimal| | | | hour digits and M represents decimal minute | | - | | digits [-23:59, +23:59]. | | + | | digits [-23:59, +23:59]. [1]_ | | +-----------+------------------------------------------------+-------+ | ``%Z`` | Time zone name (no characters if no time zone | | - | | exists). | | + | | exists). Deprecated. [1]_ | | +-----------+------------------------------------------------+-------+ | ``%%`` | A literal ``'%'`` character. | | +-----------+------------------------------------------------+-------+ @@ -480,7 +480,7 @@ Functions calculations when the day of the week and the year are specified. Here is an example, a format for dates compatible with that specified in the - :rfc:`2822` Internet email standard. [#]_ :: + :rfc:`2822` Internet email standard. [1]_ :: >>> from time import gmtime, strftime >>> strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime()) @@ -908,10 +908,9 @@ Timezone Constants .. rubric:: Footnotes -.. [#] The use of ``%Z`` is now deprecated, but the ``%z`` escape that expands to the - preferred hour/minute offset is not supported by all ANSI C libraries. Also, a +.. [1] The use of ``%Z`` is now deprecated, but the ``%z`` escape that expands to the + preferred hour/minute offset is not supported by all ANSI C libraries. Also, a strict reading of the original 1982 :rfc:`822` standard calls for a two-digit - year (%y rather than %Y), but practice moved to 4-digit years long before the + year (``%y`` rather than ``%Y``), but practice moved to 4-digit years long before the year 2000. After that, :rfc:`822` became obsolete and the 4-digit year has been first recommended by :rfc:`1123` and then mandated by :rfc:`2822`. - |