summaryrefslogtreecommitdiff
path: root/Lib/datetime.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-04-13 20:12:53 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2013-04-13 20:12:53 +0300
commitd24abee4632a233d17eaad0ab962c97545e387b3 (patch)
tree5ba6103d9f99032bd4b48010df3cebe6cdd479c3 /Lib/datetime.py
parent5c965dafbd7ba310b91bfc861d8f81dc9e139f31 (diff)
parentf756f947f95b4b094d75f98d74b96ab3061133a3 (diff)
downloadcpython-git-d24abee4632a233d17eaad0ab962c97545e387b3.tar.gz
#17571: merge with 3.3.
Diffstat (limited to 'Lib/datetime.py')
-rw-r--r--Lib/datetime.py18
1 files changed, 3 insertions, 15 deletions
diff --git a/Lib/datetime.py b/Lib/datetime.py
index 87530150b4..bc1486c919 100644
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -1,19 +1,7 @@
-"""Concrete date/time and related types -- prototype implemented in Python.
+"""Concrete date/time and related types.
-See http://www.zope.org/Members/fdrake/DateTimeWiki/FrontPage
-
-See also http://dir.yahoo.com/Reference/calendars/
-
-For a primer on DST, including many current DST rules, see
-http://webexhibits.org/daylightsaving/
-
-For more about DST than you ever wanted to know, see
-ftp://elsie.nci.nih.gov/pub/
-
-Sources for time zone and DST data: http://www.twinsun.com/tz/tz-link.htm
-
-This was originally copied from the sandbox of the CPython CVS repository.
-Thanks to Tim Peters for suggesting using it.
+See http://www.iana.org/time-zones/repository/tz-link.html for
+time zone and DST data sources.
"""
import time as _time