python-urlopen 0.0.7.1__tar.gz → 0.0.8__tar.gz

{python_urlopen-0.0.7.1 → python_urlopen-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-urlopen
-Version: 0.0.7.1
+Version: 0.0.8
 Summary: Python urlopen wrapper.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-urlopen
 License: MIT

{python_urlopen-0.0.7.1 → python_urlopen-0.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-urlopen"
-version = "0.0.7.1"
+version = "0.0.8"
 description = "Python urlopen wrapper."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"

{python_urlopen-0.0.7.1 → python_urlopen-0.0.8}/urlopen/__init__.py

@@ -2,7 +2,7 @@
 # coding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 7)
+__version__ = (0, 0, 8)
 __all__ = ["urlopen", "request", "download"]
 
 import errno
@@ -18,9 +18,11 @@ from os import fsdecode, fstat, makedirs, PathLike
 from os.path import abspath, dirname, isdir, join as joinpath
 from re import compile as re_compile
 from shutil import COPY_BUFSIZE # type: ignore
+from socket import getdefaulttimeout, setdefaulttimeout
 from ssl import SSLContext, _create_unverified_context
 from string import punctuation
-from typing import cast, Any
+from types import EllipsisType
+from typing import cast, Any, Literal
 from urllib.error import HTTPError
 from urllib.parse import quote, urlencode, urlsplit
 from urllib.request import build_opener, HTTPCookieProcessor, HTTPSHandler, OpenerDirector, Request
@@ -39,6 +41,9 @@ if "__del__" not in OpenerDirector.__dict__:
 _opener: None | OpenerDirector = None
 CRE_search_charset = re_compile(r"\bcharset=(?P<charset>[^ ;]+)").search
 
+if getdefaulttimeout() is None:
+    setdefaulttimeout(60)
+
 
 def decompress_deflate(data: bytes, compresslevel: int = 9) -> bytes:
     # Fork from: https://stackoverflow.com/questions/1089662/python-inflate-and-deflate-implementations#answer-1089787
@@ -62,13 +67,20 @@ def decompress_deflate(data: bytes, compresslevel: int = 9) -> bytes:
     return deflated
 
 
+def get_charset(content_type: str, default="utf-8") -> str:
+    match = CRE_search_charset(content_type)
+    if match is None:
+        return "utf-8"
+    return match["charset"]
+
+
 def ensure_ascii_url(url: str, /) -> str:
     if url.isascii():
         return url
     return quote(url, safe=punctuation)
 
 
-def decompress_response(resp: HTTPResponse) -> bytes:
+def decompress_response(resp: HTTPResponse, /) -> bytes:
     data = resp.read()
     content_encoding = resp.headers.get("Content-Encoding")
     match content_encoding:
@@ -168,17 +180,10 @@ def urlopen(
         return opener.open(req, timeout=timeout)
 
 
-def get_charset(content_type: str, default="utf-8") -> str:
-    match = CRE_search_charset(content_type)
-    if match is None:
-        return "utf-8"
-    return match["charset"]
-
-
 def request(
     url: str | Request, 
     method: str = "GET", 
-    parse: None | bool | Callable = None, 
+    parse: None | EllipsisType | bool | Callable = None, 
     raise_for_status: bool = True, 
     timeout: None | float = 60, 
     **request_kwargs, 
@@ -197,6 +202,9 @@ def request(
         resp = getattr(e, "file")
     if parse is None:
         return resp
+    elif parse is ...:
+        resp.close()
+        return resp
     with resp:
         if isinstance(parse, bool):
             data = decompress_response(resp)