summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2012-06-22 16:25:57 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2012-06-22 16:25:57 (GMT)
commitff493c9c465ba9502629bf5001f690068be97f33 (patch)
tree199ca65706eb720a7e4dcf99dbff6e658ed0112d
parentfdc860f3106b59ec908e0b605e51a1607ea2ff4b (diff)
downloadcpython-ff493c9c465ba9502629bf5001f690068be97f33.zip
cpython-ff493c9c465ba9502629bf5001f690068be97f33.tar.gz
cpython-ff493c9c465ba9502629bf5001f690068be97f33.tar.bz2
Issue #9527: datetime.astimezone() method will now supply a class
timezone instance corresponding to the system local timezone when called with no arguments.
-rw-r--r--Lib/datetime.py4
-rw-r--r--Lib/test/datetimetester.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/datetime.py b/Lib/datetime.py
index ce88d85..e4d7161 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 e045447..4181d4f 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