Refactor: Relative imports / imports without try block

.github/workflows/ci.yml

@@ -46,6 +46,10 @@ jobs:
           ln -s umu-protonfixes protonfixes
           cd protonfixes
           python3 .github/scripts/check_imports.py
+      # We need a known parent package in the unit tests, so we need to change to the parent dir
+      # As "umu-protonfixes" is not a valid package name, we create a symbolic link to "protonfixes"
       - name: Test with unittest
         run: |
-          python3 protonfixes_test.py
+          cd ..
+          ln -s umu-protonfixes protonfixes
+          python3 -m protonfixes.protonfixes_test

__init__.py

@@ -1,18 +1,42 @@
-"""Starts the protonfix module"""
+"""Starts the protonfix module and runs fixes after pre-flight-checks"""
 
 import os
 import sys
+import traceback
 
-RUN_CONDITIONS = [
-    'STEAM_COMPAT_DATA_PATH' in os.environ,
-    'PROTONFIXES_DISABLE' not in os.environ,
-    'waitforexitandrun' in sys.argv[1],
-]
+from . import fix
+from .logger import log
 
-if all(RUN_CONDITIONS):
-    import traceback
-    from . import fix
 
+def check_conditions() -> bool:
+    """Determine, if the actual game was executed and protonfixes isn't deactivated.
+
+    Returns:
+        bool: True, if the fix should be executed.
+
+    """    
+    return len(sys.argv) >= 1 and \
+        'STEAM_COMPAT_DATA_PATH' in os.environ and \
+        'PROTONFIXES_DISABLE' not in os.environ and \
+        'waitforexitandrun' in sys.argv[1]
+
+
+def check_iscriptevaluator() -> bool:
+    """Determine, if we were invoked while running "iscriptevaluator.exe".
+
+    Returns:
+        bool: True, if we were invoked while running "iscriptevaluator.exe".
+
+    """    
+    return len(sys.argv) >= 2 and \
+        'iscriptevaluator.exe' in sys.argv[2]
+
+
+if check_iscriptevaluator():
+    log.debug('Skipping fix execution. We are running "iscriptevaluator.exe".')
+elif not check_conditions():
+    log.warn('Skipping fix execution. We are probably running an unit test.')
+else:
     try:
         fix.main()
 

checks.py

@@ -1,9 +1,6 @@
 """Run some tests and generate warnings for proton configuration issues"""
 
-try:
-    from .logger import log
-except ImportError:
-    from logger import log
+from .logger import log
 
 
 def esync_file_limits() -> bool:

config.py

@@ -1,12 +1,9 @@
 """Load configuration settings for protonfixes"""
 
 import os
-from configparser import ConfigParser
 
-try:
-    from .logger import log
-except ImportError:
-    from logger import log
+from configparser import ConfigParser
+from .logger import log
 
 
 CONF_FILE = '~/.config/protonfixes/config.ini'

engine.py

@@ -2,6 +2,7 @@
 
 import os
 import sys
+
 from .logger import log
 
 

fix.py

@@ -4,17 +4,13 @@
 import re
 import sys
 import csv
+
 from functools import lru_cache
 from importlib import import_module
 
-try:
-    from . import config
-    from .checks import run_checks
-    from .logger import log
-except ImportError:
-    import config
-    from checks import run_checks
-    from logger import log
+from . import config
+from .checks import run_checks
+from .logger import log
 
 try:
     import __main__ as protonmain

gamefixes-egs/umu-1248080.py

@@ -1,6 +1,6 @@
 """Game fix for CYGNI: All Guns Blazing"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-egs/umu-1370140.py

@@ -1,6 +1,6 @@
 """Game fix Kao the Kangaroo (2022)"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-egs/umu-2138710.py

@@ -1,6 +1,6 @@
 """Game fix for Sifu"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-egs/umu-2144740.py

@@ -1,6 +1,6 @@
 """Game fix for Ghost Runner 2"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-egs/umu-2229940.py

@@ -1,6 +1,6 @@
 """Game fix for [REDACTED]"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-egs/umu-517710.py

@@ -1,6 +1,6 @@
 """Game fix Redout: Enhanced Edition"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-egs/umu-976590.py

@@ -1,6 +1,6 @@
 """Game fix for Bus Simulator 21 Next Stop"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-egs/umu-990080.py

@@ -1,6 +1,6 @@
 """Game fix Hogwarts Legacy"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-gog/umu-1141086411.py

@@ -1,6 +1,6 @@
 """Silent Hill 4: The Room"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-gog/umu-1209310984.py

@@ -11,8 +11,8 @@
 from tempfile import mkdtemp
 from urllib.request import urlopen
 
-from protonfixes import util
-from protonfixes.logger import log
+from .. import util
+from ..logger import log
 
 
 def main() -> None:

gamefixes-gog/umu-1228964594.py

@@ -1,6 +1,6 @@
 """Game fix for Soldier of Fortune II: Double Helix - Gold Edition"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-gog/umu-1564851593.py

@@ -10,8 +10,8 @@
 from urllib.request import urlopen
 from zipfile import ZipFile, is_zipfile
 
-from protonfixes import util
-from protonfixes.logger import log
+from .. import util
+from ..logger import log
 
 # Archive containing the text injecting framework
 arc = 'https://github.com/user-attachments/files/16136393/d3d9-2206220222.zip'

gamefixes-gog/umu-1580232252.py

@@ -1,6 +1,6 @@
 """Resident Evil (1997)"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-gog/umu-1584652180.py

@@ -1,6 +1,6 @@
 """The Wheel of Time"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-gog/umu-1771973390.py

@@ -1,6 +1,6 @@
 """METAL GEAR SOLID"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-gog/umu-2069117974.py

@@ -1,8 +1,7 @@
 """METAL GEAR SOLID 2 SUBSTANCE"""
 # GOG-ID 2069117974
 
-from protonfixes import util
-
+from .. import util
 
 def main() -> None:
     util.protontricks('dsound')

gamefixes-gog/umu-22610.py

@@ -1,6 +1,6 @@
 """Alien Breed: Impact"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-gog/umu-22650.py

@@ -1,6 +1,6 @@
 """Alien Breed 2: Assault"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-gog/umu-22670.py

@@ -1,6 +1,6 @@
 """Alien Breed 3: Descent"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/1017900.py

@@ -1,6 +1,6 @@
 """Game fix for Age of Empires: DE"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/10220.py

@@ -1,6 +1,6 @@
 """Postal III"""
 
-from protonfixes import util
+from .. import util
 
 
 # Missing fonts for console and various UI

gamefixes-steam/1030830.py

@@ -1,6 +1,6 @@
 """Game fix for Mafia II Definitive Edition"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/105000.py

@@ -3,7 +3,7 @@
 No cutscene audio in Daedalic Games (Memoria, The Night of the Rabbit, A New Beginning - Final Cut) (105000 230820 243200) #1412
 """
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/105400.py

@@ -3,8 +3,8 @@
 import os
 import shutil
 
-from protonfixes import util
-from protonfixes.logger import log
+from .. import util
+from ..logger import log
 
 
 def main() -> None:

gamefixes-steam/105450.py

@@ -1,6 +1,6 @@
 """Game fix for Age Of Empire 3: Complete Collection"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/1056640.py

@@ -1,6 +1,6 @@
 """Game fix for Phantasy Star Online 2"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/1062040.py

@@ -1,6 +1,6 @@
 """Dragon Star Varnir"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/1063730.py

@@ -1,6 +1,6 @@
 """Game fix for New World"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/108710.py

@@ -1,6 +1,6 @@
 """Alan Wake"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/1097150.py

@@ -1,6 +1,6 @@
 """Game fix for Fall Guys"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/1097880.py

@@ -1,6 +1,6 @@
 """Game fix for Super Naughty Maid 2"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/1105510.py

@@ -1,6 +1,6 @@
 """Game fix for Yakuza 5"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None:

gamefixes-steam/110800.py

@@ -1,6 +1,6 @@
 """Game fix for L.A. Noire"""
 
-from protonfixes import util
+from .. import util
 
 
 def main() -> None: