python-urlopen 0.0.2__tar.gz → 0.0.3__tar.gz

{python_urlopen-0.0.2 → python_urlopen-0.0.3}/PKG-INFO

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

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

{python_urlopen-0.0.2 → python_urlopen-0.0.3}/urlopen/__init__.py

@@ -2,7 +2,7 @@
 # coding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 2)
+__version__ = (0, 0, 3)
 __all__ = ["urlopen", "download"]
 
 import errno
@@ -10,6 +10,7 @@ import errno
 from collections.abc import Callable, Generator, Mapping, Sequence
 from copy import copy
 from http.client import HTTPResponse
+from http.cookiejar import CookieJar
 from inspect import isgenerator
 from json import dumps
 from os import fsdecode, fstat, makedirs, PathLike
@@ -18,7 +19,7 @@ from shutil import COPY_BUFSIZE # type: ignore
 from ssl import SSLContext, _create_unverified_context
 from typing import cast, Any, Optional
 from urllib.parse import urlencode, urlsplit
-from urllib.request import build_opener, HTTPSHandler, OpenerDirector, Request
+from urllib.request import build_opener, HTTPCookieProcessor, HTTPSHandler, OpenerDirector, Request
 
 from filewrap import bio_skip_iter, SupportsRead, SupportsWrite
 from http_response import get_filename, get_length, is_chunked, is_range_request
@@ -30,12 +31,13 @@ if "__del__" not in HTTPResponse.__dict__:
 
 def urlopen(
     url: str | Request, 
+    method: str = "GET", 
     params: Optional[str | Mapping | Sequence[tuple[Any, Any]]] = None, 
     data: Optional[bytes | str | Mapping | Sequence[tuple[Any, Any]]] = None, 
     json: Any = None, 
     headers: dict[str, str] = {"User-agent": ""}, 
-    method: str = "GET", 
     timeout: Optional[int | float] = None, 
+    cookies: Optional[CookieJar] = None, 
     proxy: Optional[tuple[str, str]] = None, 
     opener: OpenerDirector = build_opener(HTTPSHandler(context=_create_unverified_context())), 
     context: Optional[SSLContext] = None, 
@@ -77,11 +79,15 @@ def urlopen(
     else:
         if params:
             url += "?&"["?" in url] + params
-        req = Request(url, data, headers=headers, method=method.upper())
+        req = Request(url, data=data, headers=headers, method=method.upper())
     if proxy:
         req.set_proxy(*proxy)
-    if context:
-        opener = build_opener(HTTPSHandler(context=context))
+    if opener is None:
+        opener = build_opener()
+    if context is not None:
+        opener.add_handler(HTTPSHandler(context=context))
+    if cookies is not None:
+        opener.add_handler(HTTPCookieProcessor(cookies))
     if timeout is None:
         return opener.open(req)
     else:

{python_urlopen-0.0.2 → python_urlopen-0.0.3}/urlopen/__main__.py

@@ -13,21 +13,18 @@ from . import download, __version__
 
 def parse_args():
     parser = ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter)
-
     parser.add_argument("url", nargs="?", help="URL to be downloaded")
     parser.add_argument("-o", "--output-file", help="file path to be downloaded, if omitted, print into stdout")
     parser.add_argument("-r", "--resume", action="store_true", help="skip downloaded data")
     parser.add_argument("-hs", "--headers", help="dictionary of HTTP Headers to send with")
     parser.add_argument("-v", "--version", action="store_true", help="print the current version")
-
     args = parser.parse_args()
-
     if args.version:
         print(".".join(map(str, __version__)))
         raise SystemExit(0)
-
     if not args.url:
         parser.parse_args(["-h"])
+    return args
 
 
 def headers_str_to_dict(headers: str, /) -> dict[str, str]: