[Reversed coc.login changes] Reverted making coc.login a coroutine

Author: majordoobie

README.rst

@@ -52,8 +52,9 @@ This example will get a player with a certain tag, and search for 5 clans with a
 
 
     async def main():
+        coc_client = coc.Client()
         try:
-            coc_client = await coc.login("email", "password")
+            await coc_client.login("email", "password")
         except coc.invalidcredentials as error:
             exit(error)
 
@@ -105,10 +106,9 @@ whenever someone joins the clan or a member of the clan donates troops.
 
 
     async def main():
+        coc_client = coc.EVentsClient()
         try:
-            coc_client = await coc.login("email",
-                                         "password",
-                                         client=coc.EventsClient)
+            await coc.login("email", "password")
         except coc.InvalidCredentials as error:
             exit(error)
 

coc/login.py

@@ -28,7 +28,7 @@
 from .events import EventsClient
 
 
-async def login(
+def login(
     email: str, password: str, client: Type[Union[Client, EventsClient]] = Client, **kwargs
 ) -> Union[Client, EventsClient]:
     r"""Eases logging into the coc.py Client.
@@ -50,9 +50,9 @@ async def login(
     **kwargs
         Any kwargs you wish to pass into the Client object.
     """
-    coc_client = client(**kwargs)
-    await coc_client.login(email, password)
-    return coc_client
+    instance = client(**kwargs)
+    instance.loop.run_until_complete(instance.login(email, password))
+    return instance
 
 
 def login_with_keys(*keys: str, client: Type[Union[Client, EventsClient]] = Client, **kwargs) -> Union[Client, EventsClient]:

examples/discord_bot.py

@@ -255,10 +255,12 @@ async def current_war_status(ctx, clan_tag):
 async def main():
     logging.basicConfig(level=logging.ERROR)
 
+    coc_client = coc.Client()
+
     # Attempt to log into CoC API using your credentials.
     try:
-        coc_client = await coc.login(os.environ.get("DEV_SITE_EMAIL"),
-                                     os.environ.get("DEV_SITE_PASSWORD"))
+        await coc_client.login(os.environ.get("DEV_SITE_EMAIL"),
+                               os.environ.get("DEV_SITE_PASSWORD"))
     except coc.InvalidCredentials as error:
         exit(error)
 

examples/discord_bot_with_cogs.py

@@ -223,12 +223,13 @@ async def on_clan_trophy_change(old_clan, new_clan):
 
 
 async def main():
+    coc_client = coc.EventsClient()
+
     # Attempt to log into CoC API using your credentials. To enable events,
     # you must use the coc.EventsClient class
     try:
-        coc_client = await coc.login(os.environ.get("DEV_SITE_EMAIL"),
-                                     os.environ.get("DEV_SITE_PASSWORD"),
-                                     client=coc.EventsClient)
+        await coc_client.login(os.environ.get("DEV_SITE_EMAIL"),
+                               os.environ.get("DEV_SITE_PASSWORD"))
     except coc.InvalidCredentials as error:
         exit(error)
 

examples/events_example.py

@@ -104,15 +104,14 @@ async def season_started():
              str(utils.get_season_end()))
 
 
-
 async def main() -> None:
+    coc_client = coc.EventsClient()
 
     # Attempt to log into CoC API using your credentials. You must use the
     # coc.EventsClient to enable event listening
     try:
-        coc_client = await coc.login(os.environ.get("DEV_SITE_EMAIL"),
-                                     os.environ.get("DEV_SITE_PASSWORD"),
-                                     client=coc.EventsClient)
+        await coc_client.login(os.environ.get("DEV_SITE_EMAIL"),
+                               os.environ.get("DEV_SITE_PASSWORD"))
     except coc.InvalidCredentials as error:
         exit(error)
 

examples/war_logs.py

@@ -44,9 +44,10 @@ async def get_warlog_opponents_from_clan_name(client: coc.Client, name: str, no_
 
 
 async def main():
+    coc_client = coc.Client()
     try:
-        coc_client = await coc.login(os.environ.get("DEV_SITE_EMAIL"),
-                                     os.environ.get("DEV_SITE_PASSWORD"))
+        await coc_client.login(os.environ.get("DEV_SITE_EMAIL"),
+                               os.environ.get("DEV_SITE_PASSWORD"))
     except coc.InvalidCredentials as error:
         exit(error)