fixed coed

Author: kyb3r

crasync/core.py

@@ -1,6 +1,6 @@
 import aiohttp
 import asyncio
-from .models import Profile, Clan, Clans, Constants
+from .models import Profile, Clan, Constants
 
 
 class Client:
@@ -28,41 +28,29 @@ async def get_profile(self, tag):
             if resp.status == 200:
                 data = await resp.json()
             else:
-                print('API is down. Please be patient.')
-                return None
+                raise ConnectionError(f'API not responding: {resp.status}')
 
         return Profile(self, data)
-
-    async def get_clans(self, *, tags):
+        
+    async def get_clan(self, *tags):
         '''Get a clan object using tag(s)'''
-        tags = tags.split(',')
-
-        if len(tags) == 1:
-            url = f'{self.BASE}/clan/{tags[0]}'
-            async with self.session.get(url) as resp:
-                if resp.status == 200:
-                    data = await resp.json()
-                else:
-                    print('API is down. Please be patient.')
-                    return None
-            return Clan(self, data)
-
-        taglist = ''
-        i = 0
-        for tag in tags:
-            i += 1
-            taglist += tag[1:]
-            if i != len(tags):
-                taglist += ','
-
-        url = f'{self.BASE}/clan/{taglist}'
+
+        tags = ','.join(tags)
+
+        url = f'{self.BASE}/clan/{tags}'
+
         async with self.session.get(url) as resp:
             if resp.status == 200:
                 data = await resp.json()
             else:
-                print('API is down. Please be patient.')
-                return None
-        return Clans(self, data)
+                raise ConnectionError(f'API not responding: {resp.status}')
+
+        if isinstance(data, list):
+            return [Clan(self, c) for c in data]
+        else:
+            return Clan(self, c)
+
+    get_clans = get_clan
 
     async def get_constants(self):
         '''Get a profile object using a tag.'''
@@ -73,8 +61,7 @@ async def get_constants(self):
             if resp.status == 200:
                 data = await resp.json()
             else:
-                print('API is down. Please be patient.')
-                return None
+                raise ConnectionError(f'API not responding: {resp.status}')
 
         return Constants(self, data)
 

crasync/models.py

@@ -173,9 +173,6 @@ def badge_url(self):
     def __repr__(self):
         return f'<Clan tag={self.tag}>'
 
-class Clans(Base):
-    def from_data(self, data):
-        self.clans = [Clan(self.client, c) for c in data]
 
 class Profile(Base):
     '''Represents a player profile.