diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-06-22 22:07:24 +0200 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-06-22 22:07:24 +0200 |
| commit | 1326e8f301bea3032e4f0b7659953da7bef3846b (patch) | |
| tree | 715d0310cd5296789f8ac2ffc6a60b7ff447baa3 /Lib/datetime.py | |
| parent | ffd4d47d0b88a4b2ef8b1d0e3972a0f5d75fc102 (diff) | |
| parent | 7e3e496abb2bb9f5dd0956074516c20d5a0f63ef (diff) | |
| download | cpython-git-1326e8f301bea3032e4f0b7659953da7bef3846b.tar.gz | |
Merge
Diffstat (limited to 'Lib/datetime.py')
| -rw-r--r-- | Lib/datetime.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/datetime.py b/Lib/datetime.py index e4d716198f..a15c6b0919 100644 --- a/Lib/datetime.py +++ b/Lib/datetime.py @@ -1510,13 +1510,13 @@ class datetime(date): # implied by tm_isdst. delta = local - datetime(*_time.gmtime(ts)[:6]) dst = _time.daylight and localtm.tm_isdst > 0 - gmtoff = _time.altzone if dst else _time.timezone - if delta == timedelta(seconds=-gmtoff): + gmtoff = -(_time.altzone if dst else _time.timezone) + if delta == timedelta(seconds=gmtoff): tz = timezone(delta, _time.tzname[dst]) else: tz = timezone(delta) else: - tz = timezone(timedelta(seconds=-gmtoff), zone) + tz = timezone(timedelta(seconds=gmtoff), zone) elif not isinstance(tz, tzinfo): raise TypeError("tz argument must be an instance of tzinfo") |
