fix sync requests, fix get_club() and get_member() for official api

Author: SharpBit

brawlstats/brawlapi/core.py

@@ -204,7 +204,7 @@ def _get_model(self, url, model, key=None):
             # Calls the async function
             return self._aget_model(url, model=model, key=key)
 
-        data, resp = self._request(url)
+        data = self._request(url)
         if self.prevent_ratelimit:
             time.sleep(1 / self.ratelimit[0])
 
@@ -214,9 +214,7 @@ def _get_model(self, url, model, key=None):
 
         if model == Constants:
             if key:
-                print(key)
                 if data.get(key):
-                    print(f'valid key {key}')
                     return model(self, data.get(key))
                 else:
                     raise KeyError('No such Constants key "{}"'.format(key))

brawlstats/brawlapi/models.py

@@ -1,4 +1,5 @@
 from box import Box, BoxList
+from .utils import bstag
 
 
 class BaseBox:
@@ -59,7 +60,7 @@ def get_club(self, full=True):
         if not self.club:
             return None
         if full:
-            url = '{}?tag={}'.format(self.client.api.CLUB, self.club.tag)
+            url = '{}?tag={}'.format(self.client.api.CLUB, bstag(self.club.tag))
             club = self.client._get_model(url, model=Club)
         else:
             club = PartialClub(self.client, self.club)

brawlstats/officialapi/core.py

@@ -196,7 +196,7 @@ def _get_model(self, url, model, key=None):
             # Calls the async function
             return self._aget_model(url, model=model, key=key)
 
-        data, resp = self._request(url)
+        data = self._request(url)
         if self.prevent_ratelimit:
             time.sleep(1 / self.ratelimit[0])
 

brawlstats/officialapi/models.py

@@ -1,4 +1,5 @@
 from box import Box, BoxList
+from .utils import bstag
 
 
 class BaseBox:
@@ -53,7 +54,7 @@ def get_club(self):
         """
         if not self.club:
             return None
-        url = '{}?tag={}'.format(self.client.api.CLUB, self.club.tag)
+        url = '{}/{}'.format(self.client.api.CLUB, bstag(self.club.tag))
         return self.client._get_model(url, model=Club)
 
 
@@ -74,8 +75,8 @@ def get_members(self):
 
         Returns Members
         """
-        url = '{}/{}/members'.format(self.client.api.CLUB, self.tag)
-        return self._get_model(url, model=Members)
+        url = '{}/{}/members'.format(self.client.api.CLUB, bstag(self.tag))
+        return self.client._get_model(url, model=Members)
 
 
 class Members(BaseBox):

tests/brawlapi/test_async.py

@@ -103,13 +103,13 @@ async def request():
             await self.client.get_leaderboard(invalid_type, invalid_limit)
         invalid_type = 'test'
         invalid_limit = 200
-        self.assertRaises(ValueError, request)
+        self.assertAsyncRaises(ValueError, request)
         invalid_type = 'players'
         invalid_limit = 201
-        self.assertRaises(ValueError, request)
+        self.assertAsyncRaises(ValueError, request)
         invalid_type = 'players'
         invalid_limit = -5
-        self.assertRaises(ValueError, request)
+        self.assertAsyncRaises(ValueError, request)
 
 
 if __name__ == '__main__':

tests/brawlapi/test_blocking.py

@@ -98,13 +98,13 @@ def test_invalid_lb(self):
         get_lb = self.client.get_leaderboard
         invalid_type = 'test'
         invalid_limit = 200
-        self.assertRaises(ValueError, get_lb, invalid_type, invalid_limit)
+        self.assertAsyncRaises(ValueError, get_lb, invalid_type, invalid_limit)
         invalid_type = 'players'
         invalid_limit = 201
-        self.assertRaises(ValueError, get_lb, invalid_type, invalid_limit)
+        self.assertAsyncRaises(ValueError, get_lb, invalid_type, invalid_limit)
         invalid_type = 'players'
         invalid_limit = -5
-        self.assertRaises(ValueError, get_lb, invalid_type, invalid_limit)
+        self.assertAsyncRaises(ValueError, get_lb, invalid_type, invalid_limit)
 
 
 if __name__ == '__main__':