mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Issue #9527: datetime.astimezone() method will now supply a class

Browse source 
timezone instance corresponding to the system local timezone when
called with no arguments.
This commit is contained in:
Alexander Belopolsky 2012-06-22 12:25:57 -04:00
parent fdc860f310
commit ff493c9c46
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/datetime.py
View file

@ -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")

4
Lib/test/datetimetester.py
View file

@ -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