Merge pull request #51912 from YoannQDQ/python-console-__file__-available--#49191

m-kuhn · web-flow · commit e5d6ade34883 · 2023-03-18T14:56:20.000+01:00
diff --git a/python/console/console_editor.py b/python/console/console_editor.py
@@ -448,8 +448,8 @@ def runScriptCode(self):
                 filename = self.createTempFile()
                 deleteTempFile = True
 
-            self.pythonconsole.shell.runCommand("exec(Path('{0}').read_text())"
-                                                .format(filename.replace("\\", "/")))
+            self.pythonconsole.shell.runFile(filename)
+
             if deleteTempFile:
                 Path(filename).unlink()
 
diff --git a/python/console/console_sci.py b/python/console/console_sci.py
@@ -81,10 +81,11 @@ def __init__(self):
             except ModuleNotFoundError:
                 pass
 
-    def execCommandImpl(self, cmd):
+    def execCommandImpl(self, cmd, show_input=True):
         res = self.currentState()
 
-        self.writeCMD(cmd)
+        if show_input:
+            self.writeCMD(cmd)
         import webbrowser
         version = 'master' if 'master' in Qgis.QGIS_VERSION.lower() else \
             re.findall(r'^\d.[0-9]*', Qgis.QGIS_VERSION)[0]
@@ -291,3 +292,19 @@ def entered(self):
     def write(self, txt):
         if sys.stderr:
             sys.stderr.write(txt)
+
+    def runFile(self, filename):
+        filename = filename.replace("\\", "/")
+        dirname = os.path.dirname(filename)
+
+        # Append the directory of the file to the path and set __file__ to the filename
+        self._interpreter.execCommandImpl("sys.path.append('{0}')".format(dirname), False)
+        self._interpreter.execCommandImpl("__file__ = '{0}'".format(filename), False)
+
+        try:
+            # Run the file
+            self.runCommand("exec(Path('{0}').read_text())".format(filename))
+        finally:
+            # Remove the directory from the path and delete the __file__ variable
+            self._interpreter.execCommandImpl("del __file__", False)
+            self._interpreter.execCommandImpl("sys.path.remove('{0}')".format(dirname), False)
