are travis env vars bytes??

Author: SharpBit

brawlstats/brawlapi/core.py

@@ -65,6 +65,8 @@ def __init__(self, token, session=None, timeout=30, is_async=False, **options):
         self.cache = TTLCache(540, 180)  # 3 requests/sec
         self.ratelimit = [3, 3, 0]  # per second, remaining, time until reset
 
+        if isinstance(token, bytes):
+            token = token.decode('utf-8')
         self.headers = {
             'Authorization': token,
             'User-Agent': 'brawlstats/{0} (Python {1[0]}.{1[1]})'.format(self.api.VERSION, sys.version_info),

brawlstats/brawlapi/utils.py

@@ -36,12 +36,12 @@ def __init__(self, base_url, version=1):
         try:
             data = json.loads(urllib.request.urlopen(self.CONSTANTS).read())
         except (TypeError, urllib.error.HTTPError, urllib.error.URLError):
-            self.BRAWLERS = []
+            self.BRAWLERS = {}
         else:
             if data:
                 self.BRAWLERS = {b['tID'].lower(): b['scId'] for b in data['characters'] if b['tID']}
             else:
-                self.BRAWLERS = []
+                self.BRAWLERS = {}
 
 
 def bstag(tag):

brawlstats/officialapi/core.py

@@ -65,6 +65,8 @@ def __init__(self, token, session=None, timeout=30, is_async=False, **options):
         self.cache = TTLCache(100, 300)  # 20 requests/min
         self.ratelimit = [20, 20, 0]  # per minute, remaining, time until reset
 
+        if isinstance(token, bytes):
+            token = token.decode('utf-8')
         self.headers = {
             'Authorization': 'Bearer {}'.format(token),
             'User-Agent': 'brawlstats/{0} (Python {1[0]}.{1[1]})'.format(self.api.VERSION, sys.version_info),

brawlstats/officialapi/utils.py

@@ -24,12 +24,12 @@ def __init__(self, base_url, version=1):
         try:
             data = json.loads(urllib.request.urlopen(self.CONSTANTS).read())
         except (TypeError, urllib.error.HTTPError, urllib.error.URLError):
-            self.BRAWLERS = []
+            self.BRAWLERS = {}
         else:
             if data:
                 self.BRAWLERS = {b['tID'].lower(): b['scId'] for b in data['characters'] if b['tID']}
             else:
-                self.BRAWLERS = []
+                self.BRAWLERS = {}
 
 
 def bstag(tag):