correctly close files executed from QgsPythonRunner

volaya · nyalldawson · commit 7653e45321ec · 2019-03-18T19:05:43.000+10:00
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -1390,7 +1390,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
`@@ -1390,7 +1390,7 @@ int main( int argc, char *argv[] )`
`1390`	`1390`	`//replace backslashes with forward slashes`
`1391`	`1391`	`pythonfile.replace( '\\', '/' );`
`1392`	`1392`	`#endif`
`1393`		`- QgsPythonRunner::run( QStringLiteral( "exec(open('%1').read())" ).arg( pythonfile ) );`
	`1393`	`+ QgsPythonRunner::run( QStringLiteral( "with open('%1','r') as f: exec(f.read())" ).arg( pythonfile ) );`
`1394`	`1394`	`}`
`1395`	`1395`
`1396`	`1396`	/////////////////////////////////`////////////////////////////////////