Rename aiohttpclient to aiohttp

Author: Carglglz

async_modules/aiohttp/aiohttpclient/__init__.py renamed to async_modules/aiohttp/aiohttp/__init__.py

@@ -1,6 +1,6 @@
 import asyncio
 import json as _json
-from .aiohttpclient_ws import (
+from .aiohttp_ws import (
     _WSRequestContextManager,
     ClientWebSocketResponse,
     WebSocketClient,
@@ -12,7 +12,7 @@ def __init__(self, reader):
         self.content = reader
 
     def read(self, sz=-1):
-        return (yield from self.content.read(sz))
+        return self.content.read(sz)
 
     def text(self, sz=-1):
         return self.read(sz=sz)
@@ -29,22 +29,20 @@ def __init__(self, reader):
         self.content = reader
         self.chunk_size = 0
 
-    def read(self, sz=4 * 1024 * 1024):
+    async def read(self, sz=4 * 1024 * 1024):
         if self.chunk_size == 0:
-            l = yield from self.content.readline()
-            # print("chunk line:", l)
+            l = await self.content.readline()
             l = l.split(b";", 1)[0]
             self.chunk_size = int(l, 16)
-            # print("chunk size:", self.chunk_size)
             if self.chunk_size == 0:
                 # End of message
-                sep = yield from self.content.read(2)
+                sep = await self.content.read(2)
                 assert sep == b"\r\n"
                 return b""
-        data = yield from self.content.read(min(sz, self.chunk_size))
+        data = await self.content.read(min(sz, self.chunk_size))
         self.chunk_size -= len(data)
         if self.chunk_size == 0:
-            sep = yield from self.content.read(2)
+            sep = await self.content.read(2)
             assert sep == b"\r\n"
         return data
 
@@ -115,6 +113,13 @@ async def _request(self, method, url, data=None, json=None, ssl=None):
             resp = ClientResponse(reader)
         resp.status = status
         resp.headers = headers
+        try:
+            resp.headers = {
+                val.split(":", 1)[0]: val.split(":", 1)[-1].strip()
+                for val in [hed.decode().strip() for hed in headers]
+            }
+        except Exception:
+            pass
         self._reader = reader
         return resp
 
@@ -174,9 +179,7 @@ async def request_raw(self, method, url, data=None, json=None, ssl=None):
         return reader
 
     def get(self, url, ssl=None):
-        return _RequestContextManager(
-            self, self._request("GET", self._base_url + url, ssl=ssl)
-        )
+        return _RequestContextManager(self, self._request("GET", self._base_url + url, ssl=ssl))
 
     def post(self, url, data=None, json=None, ssl=None):
         return _RequestContextManager(
@@ -222,76 +225,3 @@ async def _ws_connect(self, url, ssl=None):
         await ws_client.connect(url, ssl=ssl)
         self._reader = ws_client.reader
         return ClientWebSocketResponse(ws_client)
-
-
-def request_raw(method, url):
-    try:
-        proto, dummy, host, path = url.split("/", 3)
-    except ValueError:
-        proto, dummy, host = url.split("/", 2)
-        path = ""
-
-    if proto == "http:":
-        port = 80
-    elif proto == "https:":
-        port = 443
-    else:
-        raise ValueError("Unsupported protocol: " + proto)
-
-    if ":" in host:
-        host, port = host.split(":", 1)
-        port = int(port)
-
-    reader, writer = yield from asyncio.open_connection(
-        host, port, ssl=proto == "https:"
-    )
-    # Use protocol 1.0, because 1.1 always allows to use chunked transfer-encoding
-    # But explicitly set Connection: close, even though this should be default for 1.0,
-    # because some servers misbehave w/o it.
-    query = (
-        "%s /%s HTTP/1.0\r\nHost: %s\r\nConnection: close\r\nUser-Agent: compat\r\n\r\n"
-        % (
-            method,
-            path,
-            host,
-        )
-    )
-    yield from writer.awrite(query.encode("latin-1"))
-    #    yield from writer.aclose()
-    return reader
-
-
-def request(method, url):
-    redir_cnt = 0
-    redir_url = None
-    while redir_cnt < 2:
-        reader = yield from request_raw(method, url)
-        headers = []
-        sline = yield from reader.readline()
-        sline = sline.split(None, 2)
-        status = int(sline[1])
-        chunked = False
-        while True:
-            line = yield from reader.readline()
-            if not line or line == b"\r\n":
-                break
-            headers.append(line)
-            if line.startswith(b"Transfer-Encoding:"):
-                if b"chunked" in line:
-                    chunked = True
-            elif line.startswith(b"Location:"):
-                url = line.rstrip().split(None, 1)[1].decode("latin-1")
-
-        if 301 <= status <= 303:
-            redir_cnt += 1
-            yield from reader.aclose()
-            continue
-        break
-
-    if chunked:
-        resp = ChunkedClientResponse(reader)
-    else:
-        resp = ClientResponse(reader)
-    resp.status = status
-    resp.headers = headers
-    return resp

async_modules/aiohttp/aiohttpclient/aiohttpclient_ws.py renamed to async_modules/aiohttp/aiohttp/aiohttp_ws.py

@@ -55,16 +55,13 @@ def __init__(self, params):
         self.writer = None
 
     async def connect(self, uri, ssl=None):
-        ...
         uri = urlparse(uri)
         assert uri
         if uri.protocol == "wss":
             if not ssl:
                 ssl = True
 
-        self.reader, self.writer = await asyncio.open_connection(
-            uri.hostname, uri.port, ssl=ssl
-        )
+        self.reader, self.writer = await asyncio.open_connection(uri.hostname, uri.port, ssl=ssl)
         await self.handshake(uri)
 
     @classmethod

async_modules/async_mip/async_mip.py

@@ -1,7 +1,7 @@
 # MicroPython package installer
 # MIT license; Copyright (c) 2022 Jim Mussared
 
-import aiohttpclient as aiohttp
+import aiohttp
 import sys