From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 3 Jul 2012 20:36:36 +0000 (+0100)
Subject: Closes #14902: Fixed timezone conversion of a date/time in the past. Thanks to Yuriy... 
X-Git-Tag: v3.3.0b2~324
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed1f7c834fb38481fde3f8a317a48c8fe43d0809;p=python

Closes #14902: Fixed timezone conversion of a date/time in the past. Thanks to Yuriy Syrovetskiy for the report and Juancarlo Añez for the patch on which this fix is based.
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 075b839b95..cb908fb460 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -2899,8 +2899,10 @@ class FormatterTest(unittest.TestCase):
 
     def test_time(self):
         r = self.get_record()
-        dt = datetime.datetime(1993,4,21,8,3,0,0,utc)
-        r.created = time.mktime(dt.timetuple()) - time.timezone
+        dt = datetime.datetime(1993, 4, 21, 8, 3, 0, 0, utc)
+        # We use None to indicate we want the local timezone
+        # We're essentially converting a UTC time to local time
+        r.created = time.mktime(dt.astimezone(None).timetuple())
         r.msecs = 123
         f = logging.Formatter('%(asctime)s %(message)s')
         f.converter = time.gmtime
diff --git a/Misc/ACKS b/Misc/ACKS
index 06dd7ebd5c..62d3e01cd3 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -33,6 +33,7 @@ John Anderson
 Erik Andersén
 Oliver Andrich
 Ross Andrus
+Juancarlo Añez
 Jérémy Anger
 Jon Anglin
 Éric Araujo
@@ -1167,3 +1168,4 @@ Uwe Zessin
 Kai Zhu
 Tarek Ziadé
 Peter Åstrand
+