python3 fixes

qgis · Jul 3, 2016 · f6710b0528af39f9df9ed9506e288ce9abb2d482 · f6710b0
1 parent 5e36de7
commit f6710b0528af39f9df9ed9506e288ce9abb2d482
Unified Split

Showing with 59 additions and 48 deletions.

+53 −47 python/plugins/processing/algs/grass7/Grass7Utils.py

+6 −1 python/plugins/processing/algs/saga/SagaUtils.py
diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py
@@ -114,58 +114,55 @@ def createGrass7Script(commands):
         folder = Grass7Utils.grassPath()
 
         script = Grass7Utils.grassScriptFilename()
-        gisrc = userFolder() + os.sep + 'processing.gisrc7'  # FIXME: use temporary file
+        gisrc = os.path.join(userFolder(), 'processing.gisrc7')  # FIXME: use temporary file
 
         # Temporary gisrc file
-        output = open(gisrc, 'w')
-        location = 'temp_location'
-        gisdbase = Grass7Utils.grassDataFolder()
-
-        output.write('GISDBASE: ' + gisdbase + '\n')
-        output.write('LOCATION_NAME: ' + location + '\n')
-        output.write('MAPSET: PERMANENT \n')
-        output.write('GRASS_GUI: text\n')
-        output.close()
-
-        output = open(script, 'w')
-        output.write('set HOME=' + os.path.expanduser('~') + '\n')
-        output.write('set GISRC=' + gisrc + '\n')
-        output.write('set WINGISBASE=' + folder + '\n')
-        output.write('set GISBASE=' + folder + '\n')
-        output.write('set GRASS_PROJSHARE=' + folder + os.sep + 'share'
-                     + os.sep + 'proj' + '\n')
-        output.write('set GRASS_MESSAGE_FORMAT=plain\n')
-
-        # Replacement code for etc/Init.bat
-        output.write('if "%GRASS_ADDON_PATH%"=="" set PATH=%WINGISBASE%\\bin;%WINGISBASE%\\lib;%PATH%\n')
-        output.write('if not "%GRASS_ADDON_PATH%"=="" set PATH=%WINGISBASE%\\bin;%WINGISBASE%\\lib;%GRASS_ADDON_PATH%;%PATH%\n')
-        output.write('\n')
-        output.write('set GRASS_VERSION=' + Grass7Utils.getGrassVersion() + '\n')
-        output.write('if not "%LANG%"=="" goto langset\n')
-        output.write('FOR /F "usebackq delims==" %%i IN (`"%WINGISBASE%\\etc\\winlocale"`) DO @set LANG=%%i\n')
-        output.write(':langset\n')
-        output.write('\n')
-        output.write('set PATHEXT=%PATHEXT%;.PY\n')
-        output.write('set PYTHONPATH=%PYTHONPATH%;%WINGISBASE%\\etc\\python;%WINGISBASE%\\etc\\wxpython\\n')
-        output.write('\n')
-        output.write('g.gisenv.exe set="MAPSET=PERMANENT"\n')
-        output.write('g.gisenv.exe set="LOCATION=' + location + '"\n')
-        output.write('g.gisenv.exe set="LOCATION_NAME=' + location + '"\n')
-        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('\n')
-        output.write('exit\n')
-        output.close()
+        with open(gisrc, 'w') as output:
+            location = 'temp_location'
+            gisdbase = Grass7Utils.grassDataFolder()
+
+            output.write('GISDBASE: ' + gisdbase + '\n')
+            output.write('LOCATION_NAME: ' + location + '\n')
+            output.write('MAPSET: PERMANENT \n')
+            output.write('GRASS_GUI: text\n')
+
+        with open(script, 'w') as output:
+            output.write('set HOME=' + os.path.expanduser('~') + '\n')
+            output.write('set GISRC=' + gisrc + '\n')
+            output.write('set WINGISBASE=' + folder + '\n')
+            output.write('set GISBASE=' + folder + '\n')
+            output.write('set GRASS_PROJSHARE=' + folder + os.sep + 'share'
+                         + os.sep + 'proj' + '\n')
+            output.write('set GRASS_MESSAGE_FORMAT=plain\n')
+
+            # Replacement code for etc/Init.bat
+            output.write('if "%GRASS_ADDON_PATH%"=="" set PATH=%WINGISBASE%\\bin;%WINGISBASE%\\lib;%PATH%\n')
+            output.write('if not "%GRASS_ADDON_PATH%"=="" set PATH=%WINGISBASE%\\bin;%WINGISBASE%\\lib;%GRASS_ADDON_PATH%;%PATH%\n')
+            output.write('\n')
+            output.write('set GRASS_VERSION=' + Grass7Utils.getGrassVersion() + '\n')
+            output.write('if not "%LANG%"=="" goto langset\n')
+            output.write('FOR /F "usebackq delims==" %%i IN (`"%WINGISBASE%\\etc\\winlocale"`) DO @set LANG=%%i\n')
+            output.write(':langset\n')
+            output.write('\n')
+            output.write('set PATHEXT=%PATHEXT%;.PY\n')
+            output.write('set PYTHONPATH=%PYTHONPATH%;%WINGISBASE%\\etc\\python;%WINGISBASE%\\etc\\wxpython\\n')
+            output.write('\n')
+            output.write('g.gisenv.exe set="MAPSET=PERMANENT"\n')
+            output.write('g.gisenv.exe set="LOCATION=' + location + '"\n')
+            output.write('g.gisenv.exe set="LOCATION_NAME=' + location + '"\n')
+            output.write('g.gisenv.exe set="GISDBASE=' + gisdbase + '"\n')
+            output.write('g.gisenv.exe set="GRASS_GUI=text"\n')
+            for command in commands:
+                Grass7Utils.writeCommand(output, command)
+            output.write('\n')
+            output.write('exit\n')
 
     @staticmethod
     def createGrass7BatchJobFileFromGrass7Commands(commands):
-        fout = open(Grass7Utils.grassBatchJobFilename(), 'w')
-        for command in commands:
-            fout.write(command.encode('utf8') + '\n')
-        fout.write('exit')
-        fout.close()
+        with open(Grass7Utils.grassBatchJobFilename(), 'w') as fout:
+            for command in commands:
+                Grass7Utils.writeCommand(fout, command)
+            fout.write('exit')
 
     @staticmethod
     def grassMapsetFolder():
@@ -393,3 +390,12 @@ def tr(string, context=''):
         if context == '':
             context = 'Grass7Utils'
         return QCoreApplication.translate(context, string)
+
+    @staticmethod
+    def writeCommand(output, command):
+        try:
+            # Python 2
+            output.write(command.encode('utf8') + '\n')
+        except TypeError:
+            # Python 3
+            output.write(command + '\n')
diff --git a/python/plugins/processing/algs/saga/SagaUtils.py b/python/plugins/processing/algs/saga/SagaUtils.py
@@ -98,7 +98,12 @@ def createSagaBatchJobFileFromSagaCommands(commands):
     else:
         pass
     for command in commands:
-        fout.write('saga_cmd ' + command.encode('utf8') + '\n')
+        try:
+            # Python 2
+            fout.write('saga_cmd ' + command.encode('utf8') + '\n')
+        except TypeError:
+            # Python 3
+            fout.write('saga_cmd ' + command + '\n')
 
     fout.write('exit')
     fout.close()