Fix cli async calls

Author: lafriks

karcher/cli.py

@@ -114,7 +114,7 @@ async def login(ctx: click.Context, username: str, password: str):
 
     kh = await KarcherHome.create(country=ctx.obj.country)
 
-    ctx.obj.print(kh.login(username, password))
+    ctx.obj.print(await kh.login(username, password))
 
     await kh.close()
 

karcher/karcher.py

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: MIT
 # -----------------------------------------------------------
 
-import asyncio
 import collections
 import json
 import threading
@@ -73,11 +72,6 @@ def __init__(self):
         self._http = None
         self._http_external = False
 
-    def __del__(self):
-        """Destructor"""
-
-        asyncio.run(self.close())
-
     async def close(self):
         """Close underlying connections"""
 
@@ -114,22 +108,22 @@ async def _request(self, method: str, url: str, **kwargs) -> aiohttp.ClientRespo
         data = ''
         if method == 'GET':
             params = kwargs.get('params') or {}
-            if type(params) == str:
+            if isinstance(params, str):
                 params = urllib.parse.parse_qs(params)
             buf = urllib.parse.urlencode(params)
             data = buf
             kwargs['params'] = buf
         elif method == 'POST' or method == 'PUT':
             v = params = kwargs.get('json') or {}
-            if type(v) == dict:
+            if isinstance(v, dict):
                 v = collections.OrderedDict(v.items())
                 for key, val in v.items():
                     data += key
                     if val is None:
                         data += 'null'
-                    elif type(val) == str:
+                    elif isinstance(val, str):
                         data += val
-                    elif type(val) == dict:
+                    elif isinstance(val, dict):
                         data += json.dumps(val, separators=(',', ':'))
                     else:
                         data += str(val)
@@ -174,7 +168,7 @@ async def _process_response(self, resp: aiohttp.ClientResponse, prop=None) -> An
             return None
         # Handle special response types
         result = data['result']
-        if type(result) == str:
+        if isinstance(result, str):
             raise KarcherHomeException(-2, 'Invalid response: ' + result)
         if prop is not None:
             return json.loads(decrypt(result[prop]))

karcher/utils.py

@@ -102,12 +102,12 @@ def snake_case(value: str) -> str:
 
 
 def snake_case_fields(data: str) -> str:
-    if type(data) is dict:
+    if isinstance(data, dict):
         n = {}
         for k, v in data.items():
             n[snake_case(k)] = snake_case_fields(v)
         return n
-    elif type(data) is list:
+    elif isinstance(data, list):
         n = []
         for v in data:
             n.append(snake_case_fields(v))