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
1=== modified file 'XMLProcessor.py'
2--- XMLProcessor.py 2010-10-09 06:14:56 +0000
3+++ XMLProcessor.py 2010-11-03 08:36:04 +0000
4@@ -110,7 +110,10 @@
5 except:
6 pass # this was an issue on the N810
7 t = time.mktime( ptime )
8- t-= ( time.altzone)
9+ if time.daylight:
10+ t -= time.altzone
11+ else:
12+ t-= time.timezone
13 lt = time.localtime(t)
14 #what about DST?
15 #format the time

Subscribers

People subscribed via source and target branches

to status/vote changes: