aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-11-22 09:03:04 -0800
committerGitHub <noreply@github.com>2019-11-22 09:03:04 -0800
commitc58a8116475fc9e90fe87b150cde4e535173ec1c (patch)
tree04f7fedb7849c8f8b63470df5204464b49120d21
parentbpo-38804: Fix REDoS in http.cookiejar (GH-17157) (diff)
downloadcpython-c58a8116475fc9e90fe87b150cde4e535173ec1c.tar.gz
cpython-c58a8116475fc9e90fe87b150cde4e535173ec1c.tar.bz2
cpython-c58a8116475fc9e90fe87b150cde4e535173ec1c.zip
closes bpo-29275: Remove Y2K reference from time module docs (GH-17321)
The Y2K reference is not needed as it only points out that Python's use of C standard functions doesn't generally suffer from Y2K issues; the point regarding conventions for conversion of 2-digit years in :func:`strptime` is still valid. (cherry picked from commit 42bc60ead39c7be9f6bb7329977826e962f601eb) Co-authored-by: Callum Ward <wards.callum@gmail.com>
-rw-r--r--Doc/library/time.rst15
1 files changed, 5 insertions, 10 deletions
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index 17f8cfc5461..c0f336fcbe4 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -42,17 +42,12 @@ An explanation of some terminology and conventions is in order.
library; for 32-bit systems, it is typically in 2038.
.. index::
- single: Year 2000
- single: Y2K
+ single: 2-digit years
-.. _time-y2kissues:
-
-* **Year 2000 (Y2K) issues**: Python depends on the platform's C library, which
- generally doesn't have year 2000 issues, since all dates and times are
- represented internally as seconds since the epoch. Function :func:`strptime`
- can parse 2-digit years when given ``%y`` format code. When 2-digit years are
- parsed, they are converted according to the POSIX and ISO C standards: values
- 69--99 are mapped to 1969--1999, and values 0--68 are mapped to 2000--2068.
+* Function :func:`strptime` can parse 2-digit years when given ``%y`` format
+ code. When 2-digit years are parsed, they are converted according to the POSIX
+ and ISO C standards: values 69--99 are mapped to 1969--1999, and values 0--68
+ are mapped to 2000--2068.
.. index::
single: UTC