From ed1f7c834fb38481fde3f8a317a48c8fe43d0809 Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Tue, 3 Jul 2012 21:36:36 +0100 Subject: =?UTF-8?q?Closes=20#14902:=20Fixed=20timezone=20conversion=20of?= =?UTF-8?q?=20a=20date/time=20in=20the=20past.=20Thanks=20to=20Yuriy=20Syr?= =?UTF-8?q?ovetskiy=20for=20the=20report=20and=20Juancarlo=20A=C3=B1ez=20f?= =?UTF-8?q?or=20the=20patch=20on=20which=20this=20fix=20is=20based.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lib/test/test_logging.py | 6 ++++-- Misc/ACKS | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 075b839..cb908fb 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 06dd7eb..62d3e01 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 + -- cgit v0.12