Fix some code style issues

license.rtf

@@ -676,4 +676,4 @@ Public License instead of this License.  But first, please read\par
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.\par
 \par
 }
-
+

server/api/api_accessor.py

@@ -17,6 +17,7 @@ class SessionManager:
     """
     Garantor for API access
     """
+
     def __init__(self):
         self.session = None  # Instance of session
 

server/broadcast_service.py

@@ -1,3 +1,7 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from aio_pika import DeliveryMode
 
 from .config import config
@@ -9,6 +13,9 @@
 from .player_service import PlayerService
 from .timing import LazyIntervalTimer
 
+if TYPE_CHECKING:
+    from server import ServerInstance
+
 
 @with_logger
 class BroadcastService(Service):
@@ -18,7 +25,7 @@ class BroadcastService(Service):
 
     def __init__(
         self,
-        server: "ServerInstance",
+        server: ServerInstance,
         message_queue_service: MessageQueueService,
         game_service: GameService,
         player_service: PlayerService,

server/exceptions.py

@@ -14,6 +14,7 @@ class ClientError(Exception):
     If recoverable is False, it is expected that the connection be terminated
     immediately.
     """
+
     def __init__(self, message, recoverable=True, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.message = message
@@ -24,6 +25,7 @@ class BanError(Exception):
     """
     Signals that an operation could not be completed because the user is banned.
     """
+
     def __init__(self, ban_expiry, ban_reason, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.ban_expiry = ban_expiry
@@ -50,6 +52,7 @@ class AuthenticationError(Exception):
     """
     The operation failed to authenticate.
     """
+
     def __init__(self, message, method, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.message = message

server/game_service.py

@@ -33,6 +33,7 @@ class GameService(Service):
     """
     Utility class for maintaining lifecycle of games
     """
+
     def __init__(
         self,
         database: FAFDatabase,

server/gameconnection.py

@@ -503,7 +503,7 @@ async def handle_game_state(self, state: str):
             await self.on_connection_lost()
         self._mark_dirty()
 
-    async def handle_game_ended(self, *args:  List[Any]):
+    async def handle_game_ended(self, *args: List[Any]):
         """
         Signals that the simulation has ended.
         """

server/games/coop.py

@@ -1,5 +1,3 @@
-import asyncio
-
 from .game import Game
 from .typedefs import FA, GameType, InitMode, ValidityState, Victory
 

server/games/custom_game.py

@@ -1,4 +1,3 @@
-import asyncio
 import time
 
 from server.decorators import with_logger

server/games/game.py

@@ -1,9 +1,21 @@
+from __future__ import annotations
+
 import asyncio
 import json
 import logging
 import time
 from collections import defaultdict
-from typing import Any, Dict, FrozenSet, Iterable, List, Optional, Set, Tuple
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Dict,
+    FrozenSet,
+    Iterable,
+    List,
+    Optional,
+    Set,
+    Tuple
+)
 
 import pymysql
 from sqlalchemy import and_, bindparam
@@ -43,6 +55,10 @@
     VisibilityState
 )
 
+if TYPE_CHECKING:
+    from server import GameConnection, GameService, GameStatsService
+    from server.db import FAFDatabase
+
 
 class GameError(Exception):
     pass
@@ -58,9 +74,9 @@ class Game():
     def __init__(
         self,
         id_: int,
-        database: "FAFDatabase",
-        game_service: "GameService",
-        game_stats_service: "GameStatsService",
+        database: FAFDatabase,
+        game_service: GameService,
+        game_stats_service: GameStatsService,
         host: Optional[Player] = None,
         name: str = "None",
         map_: str = "SCMP_007",
@@ -192,7 +208,7 @@ def _is_observer(self, player: Player) -> bool:
         return army is None or army < 0
 
     @property
-    def connections(self) -> Iterable["GameConnection"]:
+    def connections(self) -> Iterable[GameConnection]:
         return self._connections.values()
 
     @property

server/ice_servers/nts.py

@@ -17,6 +17,7 @@ class TwilioNTS:
 
     Creates new twilio NTS tokens
     """
+
     def __init__(self, sid=None, token=None):
         if sid is None:
             sid = config.TWILIO_ACCOUNT_SID  # pragma: no cover

server/ladder_service.py

@@ -1,13 +1,14 @@
 """
 Manages interactions between players and matchmakers
 """
+from __future__ import annotations
 
 import asyncio
 import json
 import random
 import re
 from collections import defaultdict
-from typing import Dict, List, Optional, Set, Tuple
+from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple
 
 import aiocron
 from sqlalchemy import and_, func, select, text, true
@@ -37,13 +38,17 @@
 from .players import Player, PlayerState
 from .types import GameLaunchOptions, Map, NeroxisGeneratedMap
 
+if TYPE_CHECKING:
+    from .lobbyconnection import LobbyConnection
+
 
 @with_logger
 class LadderService(Service):
     """
     Service responsible for managing the 1v1 ladder. Does matchmaking, updates
     statistics, and launches the games.
     """
+
     def __init__(
         self,
         database: FAFDatabase,
@@ -516,7 +521,7 @@ async def get_game_history(
                 ])
         return result
 
-    def on_connection_lost(self, conn: "LobbyConnection") -> None:
+    def on_connection_lost(self, conn: LobbyConnection) -> None:
         if not conn.player:
             return
 

server/lobbyconnection.py

@@ -41,6 +41,7 @@
     CoopGame,
     CustomGame,
     FeaturedModType,
+    Game,
     GameConnectionState,
     GameState,
     InitMode,
@@ -1065,7 +1066,7 @@ async def command_modvault(self, message):
                                    downloads=downloads, date=int(date.timestamp()), uid=uid, name=name, version=version, author=author,
                                    ui=ui)
                         await self.send(out)
-                    except:
+                    except Exception:
                         self._logger.error(f"Error handling table_mod row (uid: {uid})", exc_info=True)
 
             elif type == "like":
@@ -1091,7 +1092,7 @@ async def command_modvault(self, message):
                         canLike = False
                     else:
                         likers.append(self.player.id)
-                except:
+                except Exception:
                     likers = []
 
                 # TODO: Avoid sending all the mod info in the world just because we liked it?

server/matchmaker/algorithm/bucket_teams.py

@@ -35,7 +35,7 @@ def find(
         teams, searches_without_team = self._find_teams(searches, team_size)
 
         matchmaker1v1 = StableMarriageMatchmaker()
-        matches, unmatched_searches =  matchmaker1v1.find(teams, 1)
+        matches, unmatched_searches = matchmaker1v1.find(teams, 1)
 
         unmatched_searches.extend(searches_without_team)
         return matches, unmatched_searches

server/matchmaker/algorithm/stable_marriage.py

@@ -10,6 +10,7 @@
 
 WeightedGraph = Dict[Search, List[Tuple[Search, float]]]
 
+
 class StableMarriage(MatchmakingPolicy1v1):
     def find(self, ranks: WeightedGraph) -> Dict[Search, Search]:
         """Perform the stable matching algorithm until a maximal stable matching
@@ -78,6 +79,7 @@ class StableMarriageMatchmaker(Matchmaker):
     Runs stable marriage to produce a list of matches
     and afterwards adds random matchups for previously unmatched new players.
     """
+
     def find(
         self, searches: Iterable[Search], team_size: int
     ) -> Tuple[List[Match], List[Search]]:

server/matchmaker/algorithm/team_matchmaker.py

@@ -56,6 +56,7 @@ class TeamMatchMaker(Matchmaker):
     8. pick the first game from the game list and remove all other games that contain the same players
     9. repeat 8. until the list is empty
     """
+
     def find(self, searches: Iterable[Search], team_size: int) -> Tuple[List[Match], List[Search]]:
         if not searches:
             return [], []

server/matchmaker/matchmaker_queue.py

@@ -1,9 +1,20 @@
+from __future__ import annotations
+
 import asyncio
 import time
 from collections import OrderedDict
 from concurrent.futures import CancelledError
 from datetime import datetime, timezone
-from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    Iterable,
+    List,
+    Optional,
+    Tuple
+)
 
 import server.metrics as metrics
 
@@ -15,6 +26,9 @@
 from .pop_timer import PopTimer
 from .search import Match, Search
 
+if TYPE_CHECKING:
+    from server import GameService
+
 MatchFoundCallback = Callable[[Search, Search, "MatchmakerQueue"], Any]
 
 
@@ -42,7 +56,7 @@ def __exit__(self, exc_type, exc_value, traceback):
 class MatchmakerQueue:
     def __init__(
         self,
-        game_service: "GameService",
+        game_service: GameService,
         on_match_found: MatchFoundCallback,
         name: str,
         queue_id: int,

server/matchmaker/pop_timer.py

@@ -1,13 +1,18 @@
+from __future__ import annotations
+
 import asyncio
 from collections import deque
 from time import time
-from typing import Deque
+from typing import TYPE_CHECKING, Deque
 
 import server.metrics as metrics
 
 from ..config import config
 from ..decorators import with_logger
 
+if TYPE_CHECKING:
+    from .matchmaker_queue import MatchmakerQueue
+
 
 @with_logger
 class PopTimer(object):
@@ -25,7 +30,8 @@ class PopTimer(object):
     The player queue rate is based on a moving average over the last few pops.
     The exact size can be set in config.
     """
-    def __init__(self, queue: "MatchmakerQueue"):
+
+    def __init__(self, queue: MatchmakerQueue):
         self.queue = queue
         # Set up deque's for calculating a moving average
         self.last_queue_amounts: Deque[int] = deque(maxlen=config.QUEUE_POP_TIME_MOVING_AVG_SIZE)

server/message_queue_service.py

@@ -26,6 +26,7 @@ class MessageQueueService(Service):
     Service handling connection to the message queue
     and providing an interface to publish messages.
     """
+
     def __init__(self) -> None:
         self._logger.debug("Message queue service created.")
         self._connection = None

server/party_service.py

@@ -1,8 +1,9 @@
 """
 Manages interactions between players and parties
 """
+from __future__ import annotations
 
-from typing import Dict, List, Set
+from typing import TYPE_CHECKING, Dict, List, Set
 
 from .core import Service
 from .decorators import with_logger
@@ -13,6 +14,9 @@
 from .team_matchmaker.player_party import PlayerParty
 from .timing import at_interval
 
+if TYPE_CHECKING:
+    from .lobbyconnection import LobbyConnection
+
 
 @with_logger
 class PartyService(Service):
@@ -186,7 +190,7 @@ def remove_party(self, party):
         # TODO: Send a special "disbanded" command?
         self.write_broadcast_party(party, members=members)
 
-    def on_connection_lost(self, conn: "LobbyConnection") -> None:
+    def on_connection_lost(self, conn: LobbyConnection) -> None:
         if not conn.player or conn.player not in self.player_parties:
             return
 

server/player_service.py

@@ -1,9 +1,10 @@
 """
 Manages connected and authenticated players
 """
+from __future__ import annotations
 
 import asyncio
-from typing import Optional, Set, ValuesView
+from typing import TYPE_CHECKING, Optional, Set, ValuesView
 
 import aiocron
 from sqlalchemy import and_, select
@@ -32,6 +33,9 @@
     user_group_assignment
 )
 
+if TYPE_CHECKING:
+    from .lobbyconnection import LobbyConnection
+
 
 @with_logger
 class PlayerService(Service):
@@ -279,7 +283,7 @@ async def shutdown(self):
                     "Could not send shutdown message to %s: %s", player, ex
                 )
 
-    def on_connection_lost(self, conn: "LobbyConnection") -> None:
+    def on_connection_lost(self, conn: LobbyConnection) -> None:
         if not conn.player:
             return