diff options
| -rw-r--r-- | Lib/test/test_logging.py | 6 | ||||
| -rw-r--r-- | 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 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 @@ -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 + |