From ff493c9c465ba9502629bf5001f690068be97f33 Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Fri, 22 Jun 2012 12:25:57 -0400 Subject: [PATCH] Issue #9527: datetime.astimezone() method will now supply a class timezone instance corresponding to the system local timezone when called with no arguments. --- Lib/datetime.py | 4 ++-- Lib/test/datetimetester.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/datetime.py b/Lib/datetime.py index ce88d85209..e4d716198f 100644 --- a/Lib/datetime.py +++ b/Lib/datetime.py @@ -1501,7 +1501,7 @@ class datetime(date): localtm = _time.localtime(ts) local = datetime(*localtm[:6]) try: - # Extract TZ data if available + # Extract TZ data if available gmtoff = localtm.tm_gmtoff zone = localtm.tm_zone except AttributeError: @@ -1517,7 +1517,7 @@ class datetime(date): tz = timezone(delta) else: tz = timezone(timedelta(seconds=-gmtoff), zone) - + elif not isinstance(tz, tzinfo): raise TypeError("tz argument must be an instance of tzinfo") diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index e045447203..4181d4fe58 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -3283,11 +3283,11 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase, unittest.TestCase): dt = self.theclass(2012, 11, 4, 6, 30, tzinfo=timezone.utc) local = dt.astimezone() self.assertEqual(dt, local) - self.assertEqual(local.strftime("%z %Z"), "+0500 EST") + self.assertEqual(local.strftime("%z %Z"), "+0500 EST") dt = self.theclass(2012, 11, 4, 5, 30, tzinfo=timezone.utc) local = dt.astimezone() self.assertEqual(dt, local) - self.assertEqual(local.strftime("%z %Z"), "+0400 EDT") + self.assertEqual(local.strftime("%z %Z"), "+0400 EDT") def test_aware_subtract(self): cls = self.theclass -- 2.40.0