Undo r81988 code change leaving added test.

diff --git a/Lib/calendar.py b/Lib/calendar.py
index a82b21a70aa7ffb6e12a8ef642255f85389ff714..0c1fdad56749d95a3f463f6a9b282082dcb03eba 100644 (file)
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -587,12 +587,17 @@ def formatstring(cols, colwidth=_colwidth, spacing=_spacing):
 
 
 EPOCH = 1970
-_EPOCH_DATETIME = datetime.datetime(EPOCH, 1, 1)
-_SECOND = datetime.timedelta(seconds=1)
+_EPOCH_ORD = datetime.date(EPOCH, 1, 1).toordinal()
+
 
 def timegm(tuple):
     """Unrelated but handy function to calculate Unix timestamp from GMT."""
-    return (datetime.datetime(*tuple[:6]) - _EPOCH_DATETIME) // _SECOND
+    year, month, day, hour, minute, second = tuple[:6]
+    days = datetime.date(year, month, 1).toordinal() - _EPOCH_ORD + day - 1
+    hours = days*24 + hour
+    minutes = hours*60 + minute
+    seconds = minutes*60 + second
+    return seconds
 
 
 def main(args):