From ad7119a3fe4fb3ad33716911f1f62c3e2a5670ad Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Sat, 23 Feb 2013 21:01:39 +0000 Subject: [PATCH] time.mktime argument should be tuple --- server/datedetector.py | 2 +- server/datetemplate.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/datedetector.py b/server/datedetector.py index d31667fb..7876580d 100644 --- a/server/datedetector.py +++ b/server/datedetector.py @@ -194,7 +194,7 @@ class DateDetector: if date == None: return None else: - return time.mktime(date) + return time.mktime(tuple(date)) ## # Sort the template lists using the hits score. This method is not called diff --git a/server/datetemplate.py b/server/datetemplate.py index f663862e..14076030 100644 --- a/server/datetemplate.py +++ b/server/datetemplate.py @@ -162,10 +162,10 @@ class DateStrptime(DateTemplate): # Bug fix for #1241756 # If the date is greater than the current time, we suppose # that the log is not from this year but from the year before - if time.mktime(date) > MyTime.time(): + if time.mktime(tuple(date)) > MyTime.time(): logSys.debug( - u"Correcting deduced year from %d to %d since %f > %f" % - (date[0], date[0]-1, time.mktime(date), MyTime.time())) + "Correcting deduced year from %d to %d since %f > %f" % + (date[0], date[0]-1, time.mktime(tuple(date)), MyTime.time())) date[0] -= 1 elif date[1] == 1 and date[2] == 1: # If it is Jan 1st, it is either really Jan 1st or there