Remove side-effects from pythonpathsetter import

pekkaklarck · pekkaklarck · commit e1f378d97bec · 2025-04-27T21:36:41.000+03:00
Use a dedicated method instead. The main motivation is avoiding linting errors from unused imports (see #5387), but this may also help with issues `pythonpathsetter` has caused (#5384).
diff --git a/src/robot/__main__.py b/src/robot/__main__.py
@@ -18,7 +18,8 @@
 import sys
 
 if __name__ == '__main__' and 'robot' not in sys.modules:
-    import pythonpathsetter
+    from pythonpathsetter import set_pythonpath
+    set_pythonpath()
 
 from robot import run_cli
 
diff --git a/src/robot/libdoc.py b/src/robot/libdoc.py
@@ -37,7 +37,8 @@
 from pathlib import Path
 
 if __name__ == '__main__' and 'robot' not in sys.modules:
-    import pythonpathsetter
+    from pythonpathsetter import set_pythonpath
+    set_pythonpath()
 
 from robot.utils import Application, seq2str
 from robot.errors import DataError
diff --git a/src/robot/pythonpathsetter.py b/src/robot/pythonpathsetter.py
@@ -27,6 +27,7 @@
 import sys
 from pathlib import Path
 
-if 'robot' not in sys.modules:
+
+def set_pythonpath():
     robot_dir = Path(__file__).absolute().parent    # zipsafe
     sys.path = [str(robot_dir.parent)] + [p for p in sys.path if Path(p) != robot_dir]
diff --git a/src/robot/rebot.py b/src/robot/rebot.py
@@ -33,7 +33,8 @@
 import sys
 
 if __name__ == '__main__' and 'robot' not in sys.modules:
-    import pythonpathsetter
+    from pythonpathsetter import set_pythonpath
+    set_pythonpath()
 
 from robot.conf import RebotSettings
 from robot.errors import DataError
diff --git a/src/robot/run.py b/src/robot/run.py
@@ -34,7 +34,8 @@
 from threading import current_thread
 
 if __name__ == '__main__' and 'robot' not in sys.modules:
-    import pythonpathsetter
+    from pythonpathsetter import set_pythonpath
+    set_pythonpath()
 
 from robot.conf import RobotSettings
 from robot.model import ModelModifier
diff --git a/src/robot/testdoc.py b/src/robot/testdoc.py
@@ -34,7 +34,8 @@
 from pathlib import Path
 
 if __name__ == '__main__' and 'robot' not in sys.modules:
-    import pythonpathsetter
+    from pythonpathsetter import set_pythonpath
+    set_pythonpath()
 
 from robot.conf import RobotSettings
 from robot.htmldata import HtmlFileWriter, ModelWriter, JsonWriter, TESTDOC
