[sextante] support for non-ASCII characters in SEXTANTE log

Author: alexbruy

python/plugins/sextante/core/SextanteLog.py

@@ -23,35 +23,37 @@
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
-import datetime
 import os
-from sextante.core.SextanteUtils import SextanteUtils
-from sextante.core.SextanteConfig import SextanteConfig
 import codecs
+import datetime
 from PyQt4 import QtGui
+
+from sextante.core.SextanteUtils import SextanteUtils
+from sextante.core.SextanteConfig import SextanteConfig
+
 class SextanteLog():
 
     LOG_ERROR = "ERROR"
     LOG_INFO = "INFO"
     LOG_WARNING = "WARNING"
     LOG_ALGORITHM = "ALGORITHM"
+    DATE_FORMAT = u"%a %b %d %Y %H:%M:%S".encode("utf-8")
     recentAlgs = []
 
     @staticmethod
     def startLogging():
         if os.path.isfile(SextanteLog.logFilename()):
-            logfile = open(SextanteLog.logFilename(), "a")
+            logfile = codecs.open(SextanteLog.logFilename(), "a", encoding="utf-8")
         else:
-            logfile = open(SextanteLog.logFilename(), "w")
-        logfile.write("Started logging at " + datetime.datetime.now().strftime("%a %b %d %Y %H:%M:%S") + "\n")
+            logfile = codecs.open(SextanteLog.logFilename(), "w", encoding="utf-8")
+        logfile.write("Started logging at " + datetime.datetime.now().strftime(SextanteLog.DATE_FORMAT).decode("utf-8") + "\n")
         logfile.close()
 
     @staticmethod
     def logFilename():
         batchfile = SextanteUtils.userFolder() + os.sep + "sextante_qgis.log"
         return batchfile
 
-
     @staticmethod
     def addToLog(msgtype, msg):
         try: #it seems that this fails sometimes depending on the msg added:
@@ -63,8 +65,8 @@ def addToLog(msgtype, msg):
                 text = a
             else:
                 text = msg.replace("\n", "|")
-            line = msgtype + "|" + datetime.datetime.now().strftime("%a %b %d %Y %H:%M:%S") + "|" + text + "\n"
-            logfile = open(SextanteLog.logFilename(), "a")
+            line = msgtype + "|" + datetime.datetime.now().strftime(SextanteLog.DATE_FORMAT).decode("utf-8") + "|" + text + "\n"
+            logfile = codecs.open(SextanteLog.logFilename(), "a", encoding="utf-8")
             #logfile = codecs.open(SextanteLog.logFilename(), "a", encoding='utf-8')
             logfile.write(line)
             logfile.close()
@@ -78,7 +80,6 @@ def addToLog(msgtype, msg):
         except:
             pass
 
-
     @staticmethod
     def getLogEntries():
         entries={}
@@ -115,7 +116,6 @@ def getLogEntries():
         entries[SextanteLog.LOG_WARNING] = warnings
         return entries
 
-
     @staticmethod
     def getRecentAlgorithms():
         recentAlgsSetting = SextanteConfig.getSetting(SextanteConfig.RECENT_ALGORITHMS)
@@ -125,14 +125,11 @@ def getRecentAlgorithms():
             pass
         return SextanteLog.recentAlgs
 
-
     @staticmethod
     def clearLog():
         os.unlink(SextanteLog.logFilename())
         SextanteLog.startLogging()
 
-
-
 class LogEntry():
     def __init__(self, date, text):
         self.date = date
@@ -141,8 +138,6 @@ def __init__(self, date, text):
 import re
 import time
 
-
-
 #===============================================================================
 
 #this code has been take from pytailer
@@ -173,7 +168,7 @@ class Tailer(object):
 
     def __init__(self, filename, read_size=1024, end=False):
         self.read_size = read_size
-        self.file = open(filename)
+        self.file = codecs.open(filename, encoding="utf-8")
         self.start_pos = self.file.tell()
         if end:
             self.seek_end()
@@ -259,8 +254,6 @@ def tail(self, lines=10):
         else:
             return []
 
-
-
     def __iter__(self):
         return self.follow()
 
@@ -269,7 +262,3 @@ def close(self):
 
 def tail(file, lines=200):
     return Tailer(file).tail(lines)
-
-
-
-