Merge pull request #9541 from qgis/backport-9537-on-release-3_6

m-kuhn · web-flow · commit c458a53a5336 · 2019-03-18T12:01:56.000+01:00
Backport #9537 on release-3_6
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -1386,7 +1386,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
`@@ -1386,7 +1386,7 @@ int main( int argc, char *argv[] )`
`1386`	`1386`	`//replace backslashes with forward slashes`
`1387`	`1387`	`pythonfile.replace( '\\', '/' );`
`1388`	`1388`	`#endif`
`1389`		`- QgsPythonRunner::run( QStringLiteral( "exec(open('%1').read())" ).arg( pythonfile ) );`
	`1389`	`+ QgsPythonRunner::run( QStringLiteral( "with open('%1','r') as f: exec(f.read())" ).arg( pythonfile ) );`
`1390`	`1390`	`}`
`1391`	`1391`
`1392`	`1392`	/////////////////////////////////`////////////////////////////////////