python-urlopen 0.1.6__tar.gz → 0.1.6.2__tar.gz

{python_urlopen-0.1.6 → python_urlopen-0.1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-urlopen
-Version: 0.1.6
+Version: 0.1.6.2
 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.7)
 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 → python_urlopen-0.1.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-urlopen"
-version = "0.1.6"
+version = "0.1.6.2"
 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.7"
 http_response = ">=0.0.9"
 python-argtools = ">=0.0.2"
 python-cookietools = ">=0.1.3"

{python_urlopen-0.1.6 → python_urlopen-0.1.6.2}/urlopen/__init__.py

@@ -98,7 +98,10 @@ class KeepAliveBaseHTTPHandler(AbstractHTTPHandler):
             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)
+            try:
+                h.set_tunnel(req._tunnel_host, headers=tunnel_headers)
+            except RuntimeError:
+                pass
         else:
             h._tunnel_host = None
             h._tunnel_port = None
@@ -122,18 +125,15 @@ class KeepAliveBaseHTTPHandler(AbstractHTTPHandler):
 
 
 class KeepAliveHTTPHandler(HTTPHandler, KeepAliveBaseHTTPHandler):
-    pass
+    pool: ConnectionPool = CONNECTION_POOL
 
 
 class KeepAliveHTTPSHandler(HTTPSHandler, KeepAliveBaseHTTPHandler):
-    pass
+    pool: ConnectionPool = CONNECTION_POOL
 
 
-_pool = CONNECTION_POOL
 _http_handler = KeepAliveHTTPHandler()
-_http_handler.pool = _pool
 _https_handler = KeepAliveHTTPSHandler(context=_create_unverified_context())
-_https_handler.pool = _pool
 _cookies = CookieJar()
 _opener: OpenerDirector = build_opener(
     _http_handler, 
@@ -163,6 +163,7 @@ def urlopen(
     cookies: None | CookieJar | BaseCookie = None, 
     timeout: None | Undefined | float = undefined, 
     opener: None | OpenerDirector = _opener, 
+    pool: None | ConnectionPool = None, 
     **_, 
 ) -> HTTPResponse:
     if isinstance(url, Request):
@@ -205,52 +206,62 @@ def urlopen(
             cookies = getattr(opener, "cookies", None)
     if cookies and "cookie" not in headers_:
         headers_["cookie"] = cookies_to_str(cookies)
-    if context is None:
-        if opener is None:
-            handlers.append(copy(_https_handler))
+    add_handler = handlers.append
+    if opener is None:
+        http_handler = copy(_http_handler)
+        if context is None:
+            https_handler = copy(_https_handler)
         else:
-            for i, handler in enumerate(handlers):
-                if isinstance(handler, KeepAliveHTTPSHandler):
-                    break
-                elif isinstance(handler, HTTPSHandler):
-                    handlers[i] = copy(_https_handler)
-                    break
-            else:
-                handlers.append(copy(_https_handler))
+            https_handler = KeepAliveHTTPSHandler(context=context)
+        if pool is not None:
+            http_handler.pool = pool
+            https_handler.pool = pool
+        add_handler(http_handler)
+        add_handler(https_handler)
     else:
-        https_handler = KeepAliveHTTPSHandler(context=context)
-        https_handler.pool = _pool
-        if opener is None:
-            handlers.append(https_handler)
+        for i, handler in enumerate(handlers):
+            if isinstance(handler, KeepAliveHTTPSHandler):
+                handler = handlers[i] = copy(handler)
+                if context is not None:
+                    setattr(handler, "_context", context)
+                break
+            elif isinstance(handler, HTTPSHandler):
+                handler = handlers[i] = KeepAliveHTTPSHandler(
+                    debuglevel=getattr(handler, "_debuglevel"), 
+                    context=getattr(handler, "_context") if context is None else context, 
+                )
+                break
         else:
-            for i, handler in enumerate(handlers):
-                if isinstance(handler, HTTPSHandler):
-                    handlers[i] = https_handler
-                    break
-            else:
-                handlers.append(https_handler)
-    if opener is None:
-        handlers.append(copy(_http_handler))
-    else:
+            handler = copy(_https_handler)
+            if context is not None:
+                setattr(handler, "_context", context)
+            add_handler(handler)
+        if pool is not None:
+            handler.pool = pool
         for i, handler in enumerate(handlers):
             if isinstance(handler, KeepAliveHTTPHandler):
+                handler = handlers[i] = copy(handler)
                 break
             elif isinstance(handler, HTTPHandler):
-                handlers[i] = copy(_http_handler)
+                handler = handlers[i] = KeepAliveHTTPHandler(
+                    debuglevel=getattr(handler, "_debuglevel"))
                 break
         else:
-            handlers.append(copy(_http_handler))
+            handler = copy(_http_handler)
+            add_handler(handler)
+        if pool is not None:
+            handler.pool = pool
     if cookies and (opener is None or all(
         h.cookies is not cookies 
         for h in getattr(opener, "handlers") if isinstance(h, HTTPCookieProcessor)
     )):
-        handlers.append(HTTPCookieProcessor(cookies))
+        add_handler(HTTPCookieProcessor(cookies))
     response_cookies = CookieJar()
     if cookies is None:
         cookies = response_cookies
-    handlers.append(HTTPCookieProcessor(response_cookies))
+    add_handler(HTTPCookieProcessor(response_cookies))
     if not follow_redirects:
-        handlers.append(NoRedirectHandler())
+        add_handler(NoRedirectHandler())
     opener = build_opener(*handlers)
     setattr(opener, "cookies", cookies)
     try: