correctly close files executed from QgsPythonRunner

volaya · volaya · commit fd91846650b9 · 2019-03-18T07:27:22.000Z
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -1387,7 +1387,7 @@ int main( int argc, char *argv[] )
     //replace backslashes with forward slashes
     pythonfile.replace( '\\', '/' );
 #endif
-    QgsPythonRunner::run( QStringLiteral( "exec(open('%1').read())" ).arg( pythonfile ) );
+    QgsPythonRunner::run( QStringLiteral( "with open('%1','r') as f: exec(f.read())" ).arg( pythonfile ) );
   }
 
   /////////////////////////////////`////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -1387,7 +1387,7 @@ int main( int argc, char *argv[] )`
`1387`	`1387`	`//replace backslashes with forward slashes`
`1388`	`1388`	`pythonfile.replace( '\\', '/' );`
`1389`	`1389`	`#endif`
`1390`		`- QgsPythonRunner::run( QStringLiteral( "exec(open('%1').read())" ).arg( pythonfile ) );`
	`1390`	`+ QgsPythonRunner::run( QStringLiteral( "with open('%1','r') as f: exec(f.read())" ).arg( pythonfile ) );`
`1391`	`1391`	`}`
`1392`	`1392`
`1393`	`1393`	/////////////////////////////////`////////////////////////////////////