Fix subprocess unclosed file

qgis · Nov 28, 2016 · c3ad30d · c3ad30d
1 parent 5ef16bf
commit c3ad30d
Showing 1 changed file with 25 additions and 25 deletions.
diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py
@@ -254,26 +254,26 @@ def executeGrass7(commands, progress, outputCommands=None):
         loglines.append(Grass7Utils.tr('GRASS GIS 7 execution console output'))
         grassOutDone = False
         command, grassenv = Grass7Utils.prepareGrass7Execution(commands)
-        proc = subprocess.Popen(
+        with subprocess.Popen(
             command,
             shell=True,
             stdout=subprocess.PIPE,
             stdin=subprocess.DEVNULL,
             stderr=subprocess.STDOUT,
             universal_newlines=True,
             env=grassenv
-        ).stdout
-        for line in iter(proc.readline, ''):
-            if 'GRASS_INFO_PERCENT' in line:
-                try:
-                    progress.setPercentage(int(line[len('GRASS_INFO_PERCENT') + 2:]))
-                except:
-                    pass
-            else:
-                if 'r.out' in line or 'v.out' in line:
-                    grassOutDone = True
-                loglines.append(line)
-                progress.setConsoleInfo(line)
+        ) as proc:
+            for line in iter(proc.stdout.readline, ''):
+                if 'GRASS_INFO_PERCENT' in line:
+                    try:
+                        progress.setPercentage(int(line[len('GRASS_INFO_PERCENT') + 2:]))
+                    except:
+                        pass
+                else:
+                    if 'r.out' in line or 'v.out' in line:
+                        grassOutDone = True
+                    loglines.append(line)
+                    progress.setConsoleInfo(line)
 
         # Some GRASS scripts, like r.mapcalculator or r.fillnulls, call
         # other GRASS scripts during execution. This may override any
@@ -283,25 +283,25 @@ def executeGrass7(commands, progress, outputCommands=None):
 
         if not grassOutDone and outputCommands:
             command, grassenv = Grass7Utils.prepareGrass7Execution(outputCommands)
-            proc = subprocess.Popen(
+            with subprocess.Popen(
                 command,
                 shell=True,
                 stdout=subprocess.PIPE,
                 stdin=subprocess.DEVNULL,
                 stderr=subprocess.STDOUT,
                 universal_newlines=True,
                 env=grassenv
-            ).stdout
-            for line in iter(proc.readline, ''):
-                if 'GRASS_INFO_PERCENT' in line:
-                    try:
-                        progress.setPercentage(int(
-                            line[len('GRASS_INFO_PERCENT') + 2:]))
-                    except:
-                        pass
-                else:
-                    loglines.append(line)
-                    progress.setConsoleInfo(line)
+            ) as proc:
+                for line in iter(proc.stdout.readline, ''):
+                    if 'GRASS_INFO_PERCENT' in line:
+                        try:
+                            progress.setPercentage(int(
+                                line[len('GRASS_INFO_PERCENT') + 2:]))
+                        except:
+                            pass
+                    else:
+                        loglines.append(line)
+                        progress.setConsoleInfo(line)
 
         if ProcessingConfig.getSetting(Grass7Utils.GRASS_LOG_CONSOLE):
             ProcessingLog.addToLog(ProcessingLog.LOG_INFO, loglines)