Import stuff inside src by fullpath

and get rid of sys.path.insert shenanigans

res/chat/channel.ui

@@ -295,12 +295,12 @@
   <customwidget>
    <class>ChatLineEdit</class>
    <extends>QLineEdit</extends>
-   <header location="global">chat.chatlineedit</header>
+   <header location="global">src.chat.chatlineedit</header>
   </customwidget>
   <customwidget>
    <class>ChatterListView</class>
    <extends>QListView</extends>
-   <header location="global">chat.chatterlistview</header>
+   <header location="global">src.chat.chatterlistview</header>
   </customwidget>
  </customwidgets>
  <tabstops>

res/coop/coop.ui

@@ -371,7 +371,7 @@ p, li { white-space: pre-wrap; }
   <customwidget>
    <class>CoopLeaderboardTableView</class>
    <extends>QTableView</extends>
-   <header>coop.cooptableview</header>
+   <header>src.coop.cooptableview</header>
   </customwidget>
  </customwidgets>
  <resources/>

res/stats/leaderboard.ui

@@ -779,12 +779,12 @@
   <customwidget>
    <class>LeaderboardTableView</class>
    <extends>QTableView</extends>
-   <header location="global">stats.itemviews.leaderboardtableview</header>
+   <header location="global">src.stats.itemviews.leaderboardtableview</header>
   </customwidget>
   <customwidget>
    <class>LeaderboardLineEdit</class>
    <extends>QLineEdit</extends>
-   <header location="global">stats.leaderboardlineedit</header>
+   <header location="global">src.stats.leaderboardlineedit</header>
   </customwidget>
  </customwidgets>
  <resources/>

setup.py

@@ -7,13 +7,11 @@
 else:
     from distutils.core import setup
 
-sys.path.insert(0, "src")
-
 company_name = "FAF Community"
 product_name = "Forged Alliance Forever"
 
 if sys.platform == "win32":
-    import config.version as version
+    from src.config import version
 
     root_dir = os.path.dirname(os.path.abspath(__file__))
     res_dir = os.path.join(root_dir, "res")

src/__main__.py

@@ -16,9 +16,9 @@
 from PyQt6.QtWidgets import QMessageBox
 from PyQt6.QtWidgets import QStyleFactory
 
-import util
-import util.crash
-from config import Settings
+from src import util
+from src.config import Settings
+from src.util import crash
 
 # Some linux distros (like Gentoo) make package scripts available
 # by copying and modifying them. This breaks path to our modules.
@@ -70,7 +70,7 @@ def excepthook(
         ),
     )
     logger.error("Runtime Info:\n{}".format(util.crash.runtime_info()))
-    dialog = util.crash.CrashDialog((exc_type, exc_value, traceback_object))
+    dialog = crash.CrashDialog((exc_type, exc_value, traceback_object))
     answer = dialog.exec()
 
     if answer == QDialog.DialogCode.Rejected:
@@ -100,7 +100,7 @@ def run_faf():
     util.THEME.loadTheme()
 
     # Create client singleton and connect
-    import client
+    from src import client
 
     faf_client = client.instance
     faf_client.setup()
@@ -121,7 +121,7 @@ def set_style(app: QApplication) -> None:
 if __name__ == '__main__':
     import logging
 
-    import config
+    from src import config
 
     QApplication.setAttribute(Qt.ApplicationAttribute.AA_ShareOpenGLContexts)
     app = QApplication(["FAF Python Client"] + trailing_args)
@@ -155,16 +155,14 @@ def set_style(app: QApplication) -> None:
     sys.excepthook = excepthook
 
     if len(trailing_args) == 0:
-        # Do the magic
-        sys.path.extend(['.'])
         run_faf()
     else:
         # Try to interpret the argument as a replay.
         if (
             trailing_args[0].lower().endswith(".fafreplay")
             or trailing_args[0].lower().endswith(".scfareplay")
         ):
-            import fa
+            from src import fa
             fa.replay(trailing_args[0], True)  # Launch as detached process
 
     # End of show

src/api/ApiAccessors.py

@@ -2,7 +2,7 @@
 
 from PyQt6.QtCore import pyqtSignal
 
-from api.ApiBase import ApiBase
+from src.api.ApiBase import ApiBase
 
 logger = logging.getLogger(__name__)
 

src/api/ApiBase.py

@@ -13,9 +13,9 @@
 from PyQt6.QtNetwork import QNetworkReply
 from PyQt6.QtNetwork import QNetworkRequest
 
-from config import Settings
-from oauth.oauth_flow import OAuth2Flow
-from oauth.oauth_flow import OAuth2FlowInstance
+from src.config import Settings
+from src.oauth.oauth_flow import OAuth2Flow
+from src.oauth.oauth_flow import OAuth2FlowInstance
 
 logger = logging.getLogger(__name__)
 

src/api/coop_api.py

@@ -1,8 +1,8 @@
-from api.ApiAccessors import DataApiAccessor
-from api.models.CoopResult import CoopResult
-from api.models.CoopScenario import CoopScenario
-from api.parsers.CoopResultParser import CoopResultParser
-from api.parsers.CoopScenarioParser import CoopScenarioParser
+from src.api.ApiAccessors import DataApiAccessor
+from src.api.models.CoopResult import CoopResult
+from src.api.models.CoopScenario import CoopScenario
+from src.api.parsers.CoopResultParser import CoopResultParser
+from src.api.parsers.CoopScenarioParser import CoopScenarioParser
 
 
 class CoopApiAccessor(DataApiAccessor):

src/api/featured_mod_api.py

@@ -1,10 +1,10 @@
 import logging
 
-from api.ApiAccessors import DataApiAccessor
-from api.models.FeaturedMod import FeaturedMod
-from api.models.FeaturedModFile import FeaturedModFile
-from api.parsers.FeaturedModFileParser import FeaturedModFileParser
-from api.parsers.FeaturedModParser import FeaturedModParser
+from src.api.ApiAccessors import DataApiAccessor
+from src.api.models.FeaturedMod import FeaturedMod
+from src.api.models.FeaturedModFile import FeaturedModFile
+from src.api.parsers.FeaturedModFileParser import FeaturedModFileParser
+from src.api.parsers.FeaturedModParser import FeaturedModParser
 
 logger = logging.getLogger(__name__)
 

src/api/matchmaker_queue_api.py

@@ -1,6 +1,6 @@
 import logging
 
-from api.ApiAccessors import DataApiAccessor
+from src.api.ApiAccessors import DataApiAccessor
 
 logger = logging.getLogger(__name__)
 

src/api/models/AbstractEntity.py

@@ -1,6 +1,6 @@
 from pydantic import Field
 
-from api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.ConfiguredModel import ConfiguredModel
 
 
 class AbstractEntity(ConfiguredModel):

src/api/models/Achievement.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from api.models.AbstractEntity import AbstractEntity
 from pydantic import Field
-from util import StringValuedEnum
+
+from src.api.models.AbstractEntity import AbstractEntity
+from src.util import StringValuedEnum
 
 
 class State(StringValuedEnum):

src/api/models/Avatar.py

@@ -1,4 +1,4 @@
-from api.models.AbstractEntity import AbstractEntity
+from src.api.models.AbstractEntity import AbstractEntity
 
 
 class Avatar(AbstractEntity):

src/api/models/AvatarAssignment.py

@@ -1,7 +1,8 @@
-from api.models.AbstractEntity import AbstractEntity
-from api.models.Avatar import Avatar
 from pydantic import Field
 
+from src.api.models.AbstractEntity import AbstractEntity
+from src.api.models.Avatar import Avatar
+
 
 class AvatarAssignment(AbstractEntity):
     expires_at: str | None    = Field(alias="expiresAt")

src/api/models/CoopMission.py

@@ -1,6 +1,6 @@
 from pydantic import Field
 
-from api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.ConfiguredModel import ConfiguredModel
 
 
 class CoopMission(ConfiguredModel):

src/api/models/CoopResult.py

@@ -1,7 +1,7 @@
 from pydantic import Field
 
-from api.models.ConfiguredModel import ConfiguredModel
-from api.models.Game import Game
+from src.api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.Game import Game
 
 
 class CoopResult(ConfiguredModel):

src/api/models/CoopScenario.py

@@ -1,7 +1,7 @@
 from pydantic import Field
 
-from api.models.ConfiguredModel import ConfiguredModel
-from api.models.CoopMission import CoopMission
+from src.api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.CoopMission import CoopMission
 
 
 class CoopScenario(ConfiguredModel):

src/api/models/Event.py

@@ -1,6 +1,7 @@
-from api.models.ConfiguredModel import ConfiguredModel
 from pydantic import Field
 
+from src.api.models.ConfiguredModel import ConfiguredModel
+
 
 class Event(ConfiguredModel):
     xd:        str        = Field(alias="id")

src/api/models/FeaturedMod.py

@@ -1,6 +1,6 @@
 from pydantic import Field
 
-from api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.ConfiguredModel import ConfiguredModel
 
 
 class FeaturedMod(ConfiguredModel):

src/api/models/FeaturedModFile.py

@@ -1,6 +1,6 @@
 from pydantic import Field
 
-from api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.ConfiguredModel import ConfiguredModel
 
 
 class FeaturedModFile(ConfiguredModel):

src/api/models/Game.py

@@ -1,8 +1,8 @@
 from pydantic import Field
 
-from api.models.ConfiguredModel import ConfiguredModel
-from api.models.Player import Player
-from api.models.PlayerStats import PlayerStats
+from src.api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.Player import Player
+from src.api.models.PlayerStats import PlayerStats
 
 
 class Game(ConfiguredModel):

src/api/models/GamePlayerStats.py

@@ -1,6 +1,7 @@
-from api.models.ConfiguredModel import ConfiguredModel
 from pydantic import Field
 
+from src.api.models.ConfiguredModel import ConfiguredModel
+
 
 class GamePlayerStats(ConfiguredModel):
     xd:         str  = Field(alias="id")

src/api/models/GeneratedMapParams.py

@@ -2,10 +2,10 @@
 
 from pydantic import Field
 
-from api.models.ConfiguredModel import ConfiguredModel
-from api.models.Map import Map
-from api.models.MapType import MapType
-from api.models.MapVersion import MapVersion
+from src.api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.Map import Map
+from src.api.models.MapType import MapType
+from src.api.models.MapVersion import MapVersion
 
 
 class GeneratedMapParams(ConfiguredModel):

src/api/models/Leaderboard.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from api.models.AbstractEntity import AbstractEntity
 from pydantic import Field
 
+from src.api.models.AbstractEntity import AbstractEntity
+
 
 class Leaderboard(AbstractEntity):
     description:     str = Field(alias="descriptionKey")

src/api/models/LeaderboardRating.py

@@ -1,7 +1,8 @@
-from api.models.AbstractEntity import AbstractEntity
-from api.models.Leaderboard import Leaderboard
 from pydantic import Field
 
+from src.api.models.AbstractEntity import AbstractEntity
+from src.api.models.Leaderboard import Leaderboard
+
 
 class LeaderboardRating(AbstractEntity):
     deviation:   float

src/api/models/LeaderboardRatingJournal.py

@@ -1,8 +1,9 @@
-from api.models.ConfiguredModel import ConfiguredModel
-from api.models.GamePlayerStats import GamePlayerStats
-from api.models.Leaderboard import Leaderboard
 from pydantic import Field
 
+from src.api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.GamePlayerStats import GamePlayerStats
+from src.api.models.Leaderboard import Leaderboard
+
 
 class LeaderboardRatingJournal(ConfiguredModel):
     create_time:      str                    = Field(alias="createTime")

src/api/models/LeagueDivision.py

@@ -1,7 +1,8 @@
-from api.models.ConfiguredModel import ConfiguredModel
-from api.models.LeagueSeason import LeagueSeason
 from pydantic import Field
 
+from src.api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.LeagueSeason import LeagueSeason
+
 
 class LeagueDivision(ConfiguredModel):
     xd:          str                 = Field(alias="id")

src/api/models/LeagueLeaderboard.py

@@ -1,6 +1,7 @@
-from api.models.ConfiguredModel import ConfiguredModel
 from pydantic import Field
 
+from src.api.models.ConfiguredModel import ConfiguredModel
+
 
 class LeagueLeaderboard(ConfiguredModel):
     technical_name: str = Field(alias="technicalName")

src/api/models/LeagueSeason.py

@@ -1,7 +1,8 @@
-from api.models.ConfiguredModel import ConfiguredModel
-from api.models.LeagueLeaderboard import LeagueLeaderboard
 from pydantic import Field
 
+from src.api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.LeagueLeaderboard import LeagueLeaderboard
+
 
 class LeagueSeason(ConfiguredModel):
     end_date:           str                = Field(alias="endDate")

src/api/models/LeagueSeasonScore.py

@@ -1,8 +1,9 @@
-from api.models.ConfiguredModel import ConfiguredModel
-from api.models.LeagueSeason import LeagueSeason
-from api.models.LeagueSubdivision import LeagueSubdivision
 from pydantic import Field
 
+from src.api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.LeagueSeason import LeagueSeason
+from src.api.models.LeagueSubdivision import LeagueSubdivision
+
 
 class LeagueSeasonScore(ConfiguredModel):
     game_count:       int                      = Field(alias="gameCount")

src/api/models/LeagueSubdivision.py

@@ -1,7 +1,8 @@
-from api.models.ConfiguredModel import ConfiguredModel
-from api.models.LeagueDivision import LeagueDivision
 from pydantic import Field
 
+from src.api.models.ConfiguredModel import ConfiguredModel
+from src.api.models.LeagueDivision import LeagueDivision
+
 
 class LeagueSubdivision(ConfiguredModel):
     index:            int                   = Field(alias="subdivisionIndex")