Backward compatible to python 3.5

Author: BattlefieldDuck

.github/workflows/python-package.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2

opengsq/cli.py

@@ -23,7 +23,7 @@ def register(self, parser: argparse.ArgumentParser):
             for (protocol_path, protocol_classnames) in re.findall(pattern, f.read()):
                 for protocol_classname in protocol_classnames.split(','):
                     name, fullpath, parameters = self.__extract(protocol_path, protocol_classname)
-                    subparser_name = f'protocol-{name}'
+                    subparser_name = 'protocol-{}'.format(name)
 
                     # Save to self.__paths dictionary
                     # Example: subparser_name = 'protocol-a2s', fullpath = 'opengsq.protocols.a2s.A2S'
@@ -65,7 +65,7 @@ def run(self, args: Sequence[str]) -> str:
     # Extract name, fullpath, parameters from path, classname
     def __extract(self, path: str, classname: str):
         name = path.split('.')[-1]
-        fullpath = f'{path}.{classname.strip()}'
+        fullpath = '{}.{}'.format(path, classname.strip())
         parameters = inspect.signature(locate(fullpath).__init__).parameters
 
         return name, fullpath, parameters
@@ -75,7 +75,7 @@ def __add_arguments(self, sub: argparse.ArgumentParser, parameters: Mapping[str,
             if parameters[key].name == 'self':
                 continue
 
-            name_or_flags = f'--{parameters[key].name}'
+            name_or_flags = '--{}'.format(parameters[key].name)
             required = parameters[key].default == inspect._empty
             default = None if required else parameters[key].default
             type = parameters[key].annotation

opengsq/protocols/a2s.py

@@ -74,7 +74,10 @@ def get_info(self) -> dict:
         header, br = self.__challenge_request(data=self.__Request.A2S_INFO)
 
         if header != self.__Response.S2A_INFO_SRC and header != self.__Response.S2A_INFO_DETAILED:
-            raise InvalidPacketException(f'Packet header mismatch. Received: {chr(header)}. Expected: {chr(self.__Response.S2A_INFO_SRC)} or {chr(self.__Response.S2A_INFO_DETAILED)}.')
+            raise InvalidPacketException(
+                'Packet header mismatch. Received: {}. Expected: {} or {}.'
+                .format(chr(header), chr(self.__Response.S2A_INFO_SRC), chr(self.__Response.S2A_INFO_DETAILED))
+            ) 
 
         info = {}
 
@@ -158,7 +161,10 @@ def get_players(self) -> list:
         header, br = self.__challenge_request(data=self.__Request.A2S_PLAYER, challenge=self.__PACKET_HEADER)
 
         if header != self.__Response.S2A_PLAYER:
-            raise InvalidPacketException(f'Packet header mismatch. Received: {chr(header)}. Expected: {chr(self.__Response.S2A_PLAYER)}.')
+            raise InvalidPacketException(
+                'Packet header mismatch. Received: {}. Expected: {}.'
+                .format(chr(header), chr(self.__Response.S2A_PLAYER))
+            )
 
         player_count = br.read_byte()
         players = []
@@ -183,7 +189,10 @@ def get_rules(self) -> list:
         header, br = self.__challenge_request(data=self.__Request.A2S_RULES, challenge=self.__PACKET_HEADER)
 
         if header != self.__Response.S2A_RULES:
-            raise InvalidPacketException(f'Packet header mismatch. Received: {chr(header)}. Expected: {chr(self.__Response.S2A_RULES)}.')
+            raise InvalidPacketException(
+                'Packet header mismatch. Received: {}. Expected: {}.'
+                .format(chr(header), chr(self.__Response.S2A_RULES))
+            )
 
         rule_count = br.read_short()
         rules = []
@@ -220,7 +229,10 @@ def get_challenge(self) -> bytes:
         header = br.read_byte()
 
         if header != self.__Response.S2C_CHALLENGE:
-            raise InvalidPacketException(f'Packet header mismatch. Received: {chr(header)}. Expected: {chr(self.__Response.S2C_CHALLENGE)}.')
+            raise InvalidPacketException(
+                'Packet header mismatch. Received: {}. Expected: {}.'
+                .format(chr(header), chr(self.__Response.S2C_CHALLENGE))
+            )
 
         self.__disconnect()
 

tests/test_a2s.py

@@ -12,7 +12,10 @@
 
 servers = []
 
-with urllib.request.urlopen(f'http://api.steampowered.com/IGameServersService/GetServerList/v1/?key={steam_api_key}&filter=appid\\{appid}\\empty\\1&limit=100') as f:
+with urllib.request.urlopen(
+    'http://api.steampowered.com/IGameServersService/GetServerList/v1/?key={}&filter=appid\\{}\\empty\\1&limit=100'
+    .format(steam_api_key, appid)
+) as f:
     server_list = json.loads(f.read().decode('latin-1').encode('utf-8'))['response']['servers']
     server_list = sorted(server_list, key=lambda s: s['players'], reverse=True)[:3]
 

tests/test_mordhau.py

@@ -12,7 +12,10 @@
 
 servers = []
 
-with urllib.request.urlopen(f'http://api.steampowered.com/IGameServersService/GetServerList/v1/?key={steam_api_key}&filter=appid\\{appid}&limit=100') as f:
+with urllib.request.urlopen(
+    'http://api.steampowered.com/IGameServersService/GetServerList/v1/?key={}&filter=appid\\{}&limit=100'
+    .format(steam_api_key, appid)
+) as f:
     server_list = json.loads(f.read().decode('latin-1').encode('utf-8'))['response']['servers']
     server_list = sorted(server_list, key=lambda s: s['players'], reverse=True)[:3]