Some changes (read desc)

- change back to testenv
- fix to load brawlers for async clients (tox doesnt work currently but should work for users)

Author: SharpBit

brawlstats/__init__.py

@@ -2,7 +2,6 @@
 from .models import *
 from .errors import *
 
-
 ############
 # METADATA #
 ############

brawlstats/core.py

@@ -50,16 +50,16 @@ def __init__(self, token, session=None, timeout=30, is_async=False, **options):
         self.loop = options.get('loop', asyncio.get_event_loop()) if self.is_async else None
         self.connector = options.get('connector')
 
+        self.debug = options.get('debug', False)
+        self.cache = TTLCache(3200 * 3, 60 * 3)  # 3200 requests per minute
+
         # Session and request options
         self.session = options.get('session') or (
             aiohttp.ClientSession(loop=self.loop, connector=self.connector) if self.is_async else requests.Session()
         )
         self.timeout = timeout
         self.prevent_ratelimit = options.get('prevent_ratelimit', False)
-        self.api = API(options.get('base_url'), version=1)
-
-        self.debug = options.get('debug', False)
-        self.cache = TTLCache(3200 * 3, 60 * 3)  # 3200 requests per minute
+        self.api = API(base_url=options.get('base_url'), version=1)
 
         # Request/response headers
         self.headers = {
@@ -68,6 +68,13 @@ def __init__(self, token, session=None, timeout=30, is_async=False, **options):
             'Accept-Encoding': 'gzip'
         }
 
+        # Load brawlers for get_rankings
+        if self.is_async:
+            brawlers_info = self.loop.run_until_complete(self.get_brawlers())
+        else:
+            brawlers_info = self.get_brawlers()
+        self.api.set_brawlers(brawlers_info)
+
     def __repr__(self):
         return '<Client async={} timeout={} debug={}>'.format(self.is_async, self.timeout, self.debug)
 
@@ -272,19 +279,20 @@ def get_rankings(self, *, ranking: str, region=None, limit: int=200, brawler=Non
 
         Returns Ranking
         """
-        if region is None:
-            region = 'global'
-
         if brawler is not None:
             if isinstance(brawler, str):
                 brawler = brawler.lower()
+
             # Replace brawler name with ID
-            if brawler in self.api.BRAWLERS.keys():
-                brawler = self.api.BRAWLERS[brawler]
+            if brawler in self.api.CURRENT_BRAWLERS.keys():
+                brawler = self.api.CURRENT_BRAWLERS[brawler]
 
-            if brawler not in self.api.BRAWLERS.values():
+            if brawler not in self.api.CURRENT_BRAWLERS.values():
                 raise ValueError('Invalid brawler.')
 
+        if region is None:
+            region = 'global'
+
         # Check for invalid parameters
         if ranking not in ('players', 'clubs', 'brawlers'):
             raise ValueError("'ranking' must be 'players', 'clubs' or 'brawlers'.")
@@ -319,4 +327,4 @@ def get_brawlers(self):
 
         Returns Brawlers
         """
-        return self._get_model(self.api.BRAWLERS_URL, model=Brawlers)
+        return self._get_model(self.api.BRAWLERS, model=Brawlers)

brawlstats/models.py

@@ -33,7 +33,6 @@ def __getitem__(self, item):
 
 class BaseBoxList(BaseBox):
     def from_data(self, data):
-        data = data['items']
         self.raw_data = data
         self._boxed_data = BoxList(data, camel_killer_box=True)
         return self
@@ -95,6 +94,9 @@ class Members(BaseBoxList):
     Returns the members in a club.
     """
 
+    def __init__(self, client, data):
+        super().__init__(client, data['items'])
+
     def __repr__(self):
         return '<Members object count={}>'.format(len(self))
 
@@ -104,6 +106,9 @@ class Ranking(BaseBoxList):
     Returns a player or club ranking that contains a list of players or clubs.
     """
 
+    def __init__(self, client, data):
+        super().__init__(client, data['items'])
+
     def __repr__(self):
         return '<Ranking object count={}>'.format(len(self))
 
@@ -112,7 +117,9 @@ class BattleLog(BaseBoxList):
     """
     Returns a full player battle object with all of its attributes.
     """
-    pass
+
+    def __init__(self, client, data):
+        super().__init__(client, data['items'])
 
 
 class Constants(BaseBox):
@@ -127,8 +134,5 @@ class Brawlers(BaseBoxList):
     Returns list of available brawlers and information about them.
     """
 
-    def __repr__(self):
-        return '<Brawlers object count={}>'.format(len(self))
-
-    def __str__(self):
-        return 'Here {} brawlers'.format(len(self))
+    def __init__(self, client, data):
+        super().__init__(client, data['items'])

brawlstats/utils.py

@@ -1,8 +1,8 @@
 import inspect
-import json
+# import json
 import os
 import re
-import urllib.request
+# import urllib.request
 from datetime import datetime
 from functools import wraps
 
@@ -16,29 +16,18 @@ def __init__(self, base_url, version=1):
         self.CLUB = self.BASE + '/clubs'
         self.RANKINGS = self.BASE + '/rankings'
         self.CONSTANTS = 'https://fourjr.herokuapp.com/bs/constants'
-        self.BRAWLERS_URL = self.BASE + "/brawlers"
+        self.BRAWLERS = self.BASE + '/brawlers'
 
         # Get package version from __init__.py
         path = os.path.dirname(__file__)
         with open(os.path.join(path, '__init__.py')) as f:
             self.VERSION = re.search(r'^__version__ = [\'"]([^\'"]*)[\'"]', f.read(), re.MULTILINE).group(1)
 
-        # Get current brawlers and their IDs
-        try:
-            resp = urllib.request.urlopen(self.CONSTANTS + '/characters').read()
-            if isinstance(resp, bytes):
-                resp = resp.decode('utf-8')
-            data = json.loads(resp)
-        except (TypeError, urllib.error.HTTPError, urllib.error.URLError):
-            self.BRAWLERS = {}
-        else:
-            if data:
-                self.BRAWLERS = {
-                    b['tID'].lower(): int(str(b['scId'])[:2] + '0' + str(b['scId'])[2:])
-                    for b in data if b['tID']
-                }
-            else:
-                self.BRAWLERS = {}
+        self.CURRENT_BRAWLERS = {}
+
+    def set_brawlers(self, brawlers):
+        self.CURRENT_BRAWLERS = {b['name'].lower(): int(b['id']) for b in brawlers}
+        print(self.CURRENT_BRAWLERS)
 
 
 def bstag(tag):
@@ -79,8 +68,8 @@ def get_datetime(timestamp: str, unix=True):
         return time
 
 
-# do nothing
 def nothing(value):
+    """Function that returns the argument"""
     return value
 
 

tox.ini

@@ -6,7 +6,7 @@ ignore = E252,E302,E731,W605
 [tox]
 envlist = py35,py36,py37,py38
 
-[env]
+[testenv]
 changedir = tests
 deps = -r{toxinidir}/requirements-dev.txt
 sitepackages = true