diff options
author | Stuart Bishop <stuart@stuartbishop.net> | 2009-09-29 02:58:23 +0700 |
---|---|---|
committer | Stuart Bishop <stuart@stuartbishop.net> | 2009-09-29 02:58:23 +0700 |
commit | 973fb5fb04143fd42986402f20433be69fca5aa6 (patch) | |
tree | ccacece83f973db7838399bf3a29437b6b4812df | |
parent | 112de0583c188e16b82e935ab8802615b3f05e08 (diff) | |
download | pytz-973fb5fb04143fd42986402f20433be69fca5aa6.tar.gz |
Handle dst switchover with no wallclock change case better
-rw-r--r-- | src/pytz/tzfile.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/pytz/tzfile.py b/src/pytz/tzfile.py index 88f4320..7ea00c1 100644 --- a/src/pytz/tzfile.py +++ b/src/pytz/tzfile.py @@ -84,15 +84,13 @@ def build_tzinfo(zone, fp): break dst = inf[0] - prev_inf[0] # dst offset - if dst < 0: # Negative dst? Look further. + if dst <= 0: # Bad dst? Look further. for j in range(i+1, len(transitions)): stdinf = ttinfo[lindexes[j]] if not stdinf[1]: - break # Found std time. - dst = inf[0] - stdinf[0] - - if dst == 0: # Can't calculate the dst offset, so use 1hr. - dst = 3600 + dst = inf[0] - stdinf[0] + if dst > 0: + break # Found a useful std time. tzname = inf[2] |