Merge lp:~dannf/laika/lp929049 into lp:laika

Proposed by dann frazier
Status: Merged
Merged at revision: 19
Proposed branch: lp:~dannf/laika/lp929049
Merge into: lp:laika
Diff against target: 36 lines (+11/-2)
1 file modified
laika (+11/-2)
To merge this branch: bzr merge lp:~dannf/laika/lp929049
Reviewer Review Type Date Requested Status
Alex Chiang Approve
Review via email: mp+94898@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Chiang (achiang) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'laika'
--- laika 2011-11-25 07:59:12 +0000
+++ laika 2012-02-28 02:01:30 +0000
@@ -23,6 +23,13 @@
2323
24UTCNOW = datetime.datetime.utcnow()24UTCNOW = datetime.datetime.utcnow()
2525
26def lpdate2date(lpdate):
27 try:
28 dt = datetime.datetime.strptime(lpdate.split('.')[0], '%Y-%m-%dT%H:%M:%S')
29 return dt
30 except ValueError:
31 return None
32
26class LPWrap:33class LPWrap:
27 '''Simple wrapper Cache-Proxy for LP objects'''34 '''Simple wrapper Cache-Proxy for LP objects'''
28 def __init__(self, lpObj):35 def __init__(self, lpObj):
@@ -84,7 +91,9 @@
84 http://www.enricozini.org/2009/debian/using-python-datetime/91 http://www.enricozini.org/2009/debian/using-python-datetime/
85 '''92 '''
86 win = datetime.timedelta(self.window)93 win = datetime.timedelta(self.window)
87 date = date.replace(tzinfo=None)94 date = lpdate2date(date)
95 if date == None:
96 return False
88 delta = UTCNOW - date97 delta = UTCNOW - date
89 return delta <= win98 return delta <= win
9099
@@ -92,7 +101,7 @@
92 '''Using this interface adds the bug to global bug list.'''101 '''Using this interface adds the bug to global bug list.'''
93 ago = ""102 ago = ""
94 self.bugs[task.bug.id] = 1103 self.bugs[task.bug.id] = 1
95 delta = UTCNOW - task.bug.date_last_updated.replace(tzinfo=None)104 delta = UTCNOW - lpdate2date(task.bug.date_last_updated)
96 if delta.days > 0:105 if delta.days > 0:
97 ago = "%d day%s" % (delta.days, "s" if delta.days > 1 else "")106 ago = "%d day%s" % (delta.days, "s" if delta.days > 1 else "")
98107

Subscribers

People subscribed via source and target branches