[processing] partially fixed handling of non-ascii chars when running…

… grass algorithms in windows
qgis · Oct 1, 2015 · d4cb346 · d4cb346
1 parent 5d4a8d9
commit d4cb346
Showing 1 changed file with 26 additions and 25 deletions.
diff --git a/python/plugins/processing/algs/grass/GrassUtils.py b/python/plugins/processing/algs/grass/GrassUtils.py
@@ -30,6 +30,7 @@
 import codecs
 import subprocess
 import os
+import locale
 from qgis.core import QgsApplication
 from PyQt4.QtCore import QCoreApplication
 from processing.core.ProcessingConfig import ProcessingConfig
@@ -122,8 +123,9 @@ def createGrassScript(commands):
         script = GrassUtils.grassScriptFilename()
         gisrc = userFolder() + os.sep + 'processing.gisrc'
 
+        encoding = locale.getpreferredencoding()
         # Temporary gisrc file
-        output = codecs.open(gisrc, 'w', encoding='utf-8')
+        output = codecs.open(gisrc, 'w', encoding=encoding)
         location = 'temp_location'
         gisdbase = GrassUtils.grassDataFolder()
 
@@ -133,7 +135,7 @@ def createGrassScript(commands):
         output.write('GRASS_GUI: text\n')
         output.close()
 
-        output = codecs.open(script, 'w', encoding='utf-8')
+        output = codecs.open(script, 'w', encoding=encoding)
         output.write('set HOME=' + os.path.expanduser('~') + '\n')
         output.write('set GISRC=' + gisrc + '\n')
         output.write('set GRASS_SH=' + shell + '\\bin\\sh.exe\n')
@@ -163,7 +165,7 @@ def createGrassScript(commands):
         output.write('g.gisenv.exe set="GISDBASE=' + gisdbase + '"\n')
         output.write('g.gisenv.exe set="GRASS_GUI=text"\n')
         for command in commands:
-            output.write(command.encode('utf8') + '\n')
+            output.write(command + u'\n')
         output.write('\n')
         output.write('exit\n')
         output.close()
@@ -172,7 +174,7 @@ def createGrassScript(commands):
     def createGrassBatchJobFileFromGrassCommands(commands):
         fout = codecs.open(GrassUtils.grassBatchJobFilename(), 'w', encoding='utf-8')
         for command in commands:
-            fout.write(command.encode('utf8') + '\n')
+            fout.write(command + u'\n')
         fout.write('exit')
         fout.close()
 
@@ -216,27 +218,26 @@ def createTempMapset():
 
     @staticmethod
     def writeGrassWindow(filename):
-        out = codecs.open(filename, 'w', encoding='utf-8')
-        out.write('proj:       0\n')
-        out.write('zone:       0\n')
-        out.write('north:      1\n')
-        out.write('south:      0\n')
-        out.write('east:       1\n')
-        out.write('west:       0\n')
-        out.write('cols:       1\n')
-        out.write('rows:       1\n')
-        out.write('e-w resol:  1\n')
-        out.write('n-s resol:  1\n')
-        out.write('top:        1\n')
-        out.write('bottom:     0\n')
-        out.write('cols3:      1\n')
-        out.write('rows3:      1\n')
-        out.write('depths:     1\n')
-        out.write('e-w resol3: 1\n')
-        out.write('n-s resol3: 1\n')
-        out.write('t-b resol:  1\n')
-
-        out.close()
+        with open(filename, 'w') as out:
+            out.write('proj:       0\n')
+            out.write('zone:       0\n')
+            out.write('north:      1\n')
+            out.write('south:      0\n')
+            out.write('east:       1\n')
+            out.write('west:       0\n')
+            out.write('cols:       1\n')
+            out.write('rows:       1\n')
+            out.write('e-w resol:  1\n')
+            out.write('n-s resol:  1\n')
+            out.write('top:        1\n')
+            out.write('bottom:     0\n')
+            out.write('cols3:      1\n')
+            out.write('rows3:      1\n')
+            out.write('depths:     1\n')
+            out.write('e-w resol3: 1\n')
+            out.write('n-s resol3: 1\n')
+            out.write('t-b resol:  1\n')
+
 
     @staticmethod
     def prepareGrassExecution(commands):