heybuddy

Merge lp:~cmn/heybuddy/time into lp:heybuddy

  1. time
  2. Merge into trunk
Proposed by Carlos Martín Nieto
Status: Needs review
Proposed branch: lp:~cmn/heybuddy/time
Merge into: lp:heybuddy
Diff against target: 15 lines (+4/-1)
1 file modified
XMLProcessor.py (+4/-1)
To merge this branch: bzr merge lp:~cmn/heybuddy/time
Reviewer Review Type Date Requested Status
jezra Approve
Review via email: mp+39940@code.launchpad.net

Description of the change

Shows the correct time in Europe, where we've already changed to non-DST time

To post a comment you must log in.
Revision history for this message
jezra (jezra) :
review: Approve
Reply

Unmerged revisions

192. By Carlos Martín Nieto

Calculate the correct time if DST isn't enabled

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'XMLProcessor.py'
--- XMLProcessor.py 2010-10-09 06:14:56 +0000
+++ XMLProcessor.py 2010-11-03 08:36:04 +0000
@@ -110,7 +110,10 @@
110 except:110 except:
111 pass # this was an issue on the N810111 pass # this was an issue on the N810
112 t = time.mktime( ptime )112 t = time.mktime( ptime )
113 t-= ( time.altzone)113 if time.daylight:
114 t -= time.altzone
115 else:
116 t-= time.timezone
114 lt = time.localtime(t)117 lt = time.localtime(t)
115 #what about DST?118 #what about DST?
116 #format the time 119 #format the time

Subscribers

People subscribed via source and target branches

to status/vote changes: