log_source.py
changeset 73 5a7188bf2894
parent 72 5ade0288f2ec
child 76 cc3ab2c39ded
--- a/log_source.py	Mon Feb 09 22:17:10 2009 +0200
+++ b/log_source.py	Mon Feb 09 23:49:57 2009 +0200
@@ -39,7 +39,7 @@
         XXX: modify to implement LogSource?
     """
 
-    def __init__ (self, path, parser, start_date=None, charset='utf-8', sep='\n') :
+    def __init__ (self, path, parser, charset, start_date=None, sep='\n') :
         """
             Open the file at the given path, which contains data with the given charset, as lines separated by the
             given separator. Lines are parsed using the given parser, using the given date as an initial date, see
@@ -204,7 +204,7 @@
         A directory containing a series of timestamped LogFiles
     """
 
-    def __init__ (self, path, tz, parser, charset='utf-8', filename_fmt='%Y-%m-%d') :
+    def __init__ (self, path, tz, parser, charset, filename_fmt) :
         """
             Load the logfiles at the given path.
             
@@ -247,7 +247,7 @@
         try :
             if load :
                 # open+return the LogFile
-                return LogFile(path, self.parser, d, self.charset)
+                return LogFile(path, self.parser, self.charset, d)
             
             else :
                 # test