[Python-checkins] cpython (merge 3.3 -> default): #17571: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/0d2c364c7e5d
changeset:   83301:0d2c364c7e5d
parent:      83298:86a95813e5c3
parent:      83300:70f9f6752d28
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Apr 13 20:12:53 2013 +0300
summary:
  #17571: merge with 3.3.

files:
  Lib/datetime.py |  18 +++---------------
  1 files changed, 3 insertions(+), 15 deletions(-)


diff --git a/Lib/datetime.py b/Lib/datetime.py
--- 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

-- 
Repository URL: http://hg.python.org/cpython