[Finished updates]

Author: majordoobie

coc/__init__.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = "2.0.2"
+__version__ = "2.1.0"
 
 from .abc import BasePlayer, BaseClan
 from .clans import RankedClan, Clan

coc/events.py

@@ -41,7 +41,10 @@
 
 
 class Event:
-    """Object that is created for an event. This contains runner functions, tags and type."""
+    """
+    Object that is created for an event. This contains runner functions,
+    tags and type.
+    """
 
     __slots__ = ("runner", "callback", "tags", "type")
 
@@ -719,13 +722,6 @@ def run_forever(self):
         except KeyboardInterrupt:
             self.close()
 
-    # async def close(self):
-    #     """Closes the client and all running tasks."""
-    #     tasks = {t for t in asyncio.all_tasks(loop=self.loop) if not t.done()}
-    #     for task in tasks:
-    #         task.cancel()
-    #     await super().close()
-
     def dispatch(self, event_name: str, *args, **kwargs):
         # pylint: disable=broad-except
         registered = self._listeners["client"].get(event_name)

coc/ext/discordlinks/__init__.py

@@ -44,7 +44,7 @@ def extract_expiry_from_jwt_token(token):
         return None
 
 
-def login(username: str, password: str, loop: asyncio.AbstractEventLoop = None) -> "DiscordLinkClient":
+async def login(username: str, password: str) -> "DiscordLinkClient":
     """Eases logging into the API client.
 
     For more information on this project, please join the discord server - <discord.gg/Eaja7gJ>
@@ -66,9 +66,8 @@ def login(username: str, password: str, loop: asyncio.AbstractEventLoop = None)
         raise TypeError("username and password must both be a string")
     if not username or not password:
         raise ValueError("username or password must not be an empty string.")
-    if loop and not isinstance(loop, asyncio.AbstractEventLoop):
-        raise TypeError("loop must be of type asyncio.AbstractEventLoop, or None.")
 
+    loop = asyncio.get_running_loop()
     return DiscordLinkClient(username, password, loop)
 
 

coc/miscmodels.py

@@ -593,7 +593,7 @@ class CapitalDistrict:
         :class:`int`: The district's hall level
     """
 
-    __slots__ = ("id", "name", "_client", "hall_level")
+    __slots__ = ("id", "name", "hall_level")
 
     def __str__(self):
         return self.name
@@ -603,12 +603,12 @@ def __repr__(self):
         return "<%s %s>" % (self.__class__.__name__, " ".join("%s=%r" % t for t in attrs),)
 
     def __eq__(self, other):
-        return isinstance(other, self.__class__) and self.id == other.id
+        return isinstance(other, self.__class__) and \
+               self.id == other.id and \
+               self.hall_level == other.hall_level
 
     def __init__(self, *, data, client):
         # pylint: disable=invalid-name
-        self._client = client
-
         self.id: int = data.get("id")
         self.name: str = data.get("name")
         self.hall_level: int = data.get("districtHallLevel")

examples/discord_links.py

@@ -5,8 +5,8 @@
 
 
 async def main():
-    client = discordlinks.login(os.environ["LINKS_API_USERNAME"],
-                                os.environ["LINKS_API_PASSWORD"])
+    client = await discordlinks.login(os.environ["LINKS_API_USERNAME"],
+                                      os.environ["LINKS_API_PASSWORD"])
 
     player_tag = "#JY9J2Y99"
     discord_id = 230214242618441728