python-urlopen 0.1.6.1__tar.gz → 0.1.6.3__tar.gz

{python_urlopen-0.1.6.1 → python_urlopen-0.1.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-urlopen
-Version: 0.1.6.1
+Version: 0.1.6.3
 Summary: Python urlopen wrapper.
 Home-page: https://github.com/ChenyangGao/python-modules/tree/main/python-urlopen
 License: MIT
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: http_client_request (>=0.0.6)
+Requires-Dist: http_client_request (>=0.0.9.2)
 Requires-Dist: http_response (>=0.0.9)
 Requires-Dist: python-argtools (>=0.0.2)
 Requires-Dist: python-cookietools (>=0.1.3)

{python_urlopen-0.1.6.1 → python_urlopen-0.1.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-urlopen"
-version = "0.1.6.1"
+version = "0.1.6.3"
 description = "Python urlopen wrapper."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -27,7 +27,7 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.12"
-http_client_request = ">=0.0.6"
+http_client_request = ">=0.0.9.2"
 http_response = ">=0.0.9"
 python-argtools = ">=0.0.2"
 python-cookietools = ">=0.1.3"

{python_urlopen-0.1.6.1 → python_urlopen-0.1.6.3}/urlopen/__init__.py

@@ -25,7 +25,7 @@ from urllib.request import (
 
 from argtools import argcount
 from cookietools import cookies_to_str, extract_cookies, update_cookies
-from dicttools import iter_items
+from dicttools import dict_map, iter_items
 from filewrap import bio_skip_iter, SupportsRead, SupportsWrite
 from http_client_request import ConnectionPool, HTTPResponse, CONNECTION_POOL
 from http_request import normalize_request_args, SupportsGeturl
@@ -86,38 +86,36 @@ class KeepAliveBaseHTTPHandler(AbstractHTTPHandler):
             origin = "https://" + host
         else:
             origin = "http://" + host
-        h = pool.get_connection(origin, timeout=req.timeout)
-        h.set_debuglevel(self._debuglevel) # type: ignore
-        headers = dict(req.unredirected_hdrs)
-        headers.update({k: v for k, v in req.headers.items()
-                        if k not in headers})
+        con = pool.get_connection(origin, timeout=req.timeout)
+        con.set_debuglevel(self._debuglevel) # type: ignore
+        headers = dict_map(req.unredirected_hdrs or (), key=str.lower)
+        headers.update({k0: v for k, v in req.headers.items()
+                        if (k0 := k.lower()) not in headers})
         headers.setdefault("connection", "keep-alive")
         if req._tunnel_host:
             tunnel_headers = {}
-            proxy_auth_hdr = "Proxy-Authorization"
+            proxy_auth_hdr = "proxy-authorization"
             if proxy_auth_hdr in headers:
                 tunnel_headers[proxy_auth_hdr] = headers[proxy_auth_hdr]
                 del headers[proxy_auth_hdr]
-            h.set_tunnel(req._tunnel_host, headers=tunnel_headers)
+            con.set_tunnel(req._tunnel_host, headers=tunnel_headers)
         else:
-            h._tunnel_host = None
-            h._tunnel_port = None
-            h._tunnel_headers.clear()
+            con.set_tunnel()
         try:
             try:
-                h.request(req.get_method(), req.selector, req.data, headers,
-                          encode_chunked=req.has_header('Transfer-encoding'))
+                con.request(req.get_method(), req.selector, req.data, headers,
+                            encode_chunked=req.has_header('Transfer-encoding'))
             except OSError as err:
                 raise URLError(err)
-            r = h.getresponse()
+            r = con.getresponse()
         except:
-            pool.return_connection(h)
+            pool.return_connection(con)
             raise
         r.url = req.get_full_url()
         r.msg = r.reason
         if headers.get("connection") == "keep-alive":
             setattr(r, "pool", pool)
-        setattr(r, "connection", h)
+        setattr(r, "connection", con)
         return r