Merge pull request #72 from SharpBit/development

Development

Author: SharpBit

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [4.0.5] - 7/27/20
+### Fixed
+- Removed the print statement on client initialization
+- Actually uses asyncio.Lock properly if the async client has the option `prevent_ratelimit=True`
+
 
 ## [4.0.4] - 7/22/20
 ### Added

brawlstats/__init__.py

@@ -7,7 +7,7 @@
 ############
 
 
-__version__ = 'v4.0.4'
+__version__ = 'v4.0.5'
 __title__ = 'brawlstats'
 __license__ = 'MIT'
 __author__ = 'SharpBit'

brawlstats/core.py

@@ -59,6 +59,8 @@ def __init__(self, token, session=None, timeout=30, is_async=False, **options):
         )
         self.timeout = timeout
         self.prevent_ratelimit = options.get('prevent_ratelimit', False)
+        if self.is_async and self.prevent_ratelimit:
+            self.lock = asyncio.Lock(loop=self.loop)
         self.api = API(base_url=options.get('base_url'), version=1)
 
         # Request/response headers
@@ -164,8 +166,8 @@ def _request(self, url):
     async def _aget_model(self, url, model, key=None):
         """Method to turn the response data into a Model class for the async client."""
         if self.prevent_ratelimit:
-            # Use asyncio.Lock() if prevent_ratelimit=True
-            async with asyncio.Lock():
+            # Use self.lock if prevent_ratelimit=True
+            async with self.lock:
                 data = await self._arequest(url)
                 await asyncio.sleep(0.1)
         else:

brawlstats/utils.py

@@ -27,7 +27,6 @@ def __init__(self, base_url, version=1):
 
     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):