python-http_request 0.1.0.1__tar.gz → 0.1.2__tar.gz

{python_http_request-0.1.0.1 → python_http_request-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-http_request
-Version: 0.1.0.1
+Version: 0.1.2
 Summary: Python http response utils.
 Home-page: https://github.com/ChenyangGao/python-modules/tree/main/python-http_request
 License: MIT
@@ -20,10 +20,10 @@ 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_response (>=0.0.4)
+Requires-Dist: http_response (>=0.0.7)
 Requires-Dist: orjson
 Requires-Dist: python-asynctools (>=0.1.3)
-Requires-Dist: python-dicttools (>=0.0.1)
+Requires-Dist: python-dicttools (>=0.0.2)
 Requires-Dist: python-ensure (>=0.0.1)
 Requires-Dist: python-filewrap (>=0.2.8)
 Requires-Dist: python-texttools (>=0.0.4)

{python_http_request-0.1.0.1 → python_http_request-0.1.2}/http_request/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 1, 0)
+__version__ = (0, 1, 2)
 __all__ = [
     "SupportsGeturl", "url_origin", "complete_url", "ensure_ascii_url", 
     "urlencode", "cookies_str_to_dict", "headers_str_to_dict_by_lines", 
@@ -124,6 +124,7 @@ def urlencode(
     /, 
     encoding: str = "utf-8", 
     errors: str = "strict", 
+    ensure_ascii: bool = True, 
 ) -> str:
     if isinstance(payload, str):
         return payload
@@ -139,7 +140,10 @@ def urlencode(
                 k = str(k, encoding, errors)
             else:
                 k = str(k)
-            yield k.translate(QUERY_KEY_TRANSTAB)
+            if ensure_ascii:
+                yield quote(k)
+            else:
+                yield k.translate(QUERY_KEY_TRANSTAB)
             yield "="
             if v is True:
                 yield "true"
@@ -158,7 +162,10 @@ def urlencode(
                 v = json_dumps(v, default=json_default).decode("utf-8")
             else:
                 v = str(v)
-            yield v.replace("&", "%26")
+            if ensure_ascii:
+                yield quote(v)
+            else:
+                yield v.replace("&", "%26")
     return "".join(encode_iter(iter_items(payload)))
 
 
@@ -290,12 +297,10 @@ def encode_multipart_data(
     def encode_iter() -> Iterator[Buffer]:
         if data:
             for name, value in iter_items(data):
-                yield boundary_line
                 yield from encode_item(name, value)
                 yield b"\r\n"
         if files:
             for name, value in iter_items(files):
-                yield boundary_line
                 yield from encode_item(name, value, is_file=True)
                 yield b"\r\n"
         yield b'--%s--\r\n' % boundary_bytes
@@ -385,13 +390,11 @@ def encode_multipart_data_async(
     async def encode_iter() -> AsyncIterator[Buffer]:
         if data:
             for name, value in iter_items(data):
-                yield boundary_line
                 async for line in encode_item(name, value):
                     yield line
                 yield b"\r\n"
         if files:
             for name, value in iter_items(files):
-                yield boundary_line
                 async for line in encode_item(name, value, is_file=True):
                     yield line
                 yield b"\r\n"
@@ -428,7 +431,7 @@ def normalize_request_args(
     json: Any = None, 
     files: None | Mapping[string, Any] | Iterable[tuple[string, Any]] = None, 
     headers: None | Mapping[string, Any] | Iterable[tuple[string, Any]] = None, 
-    ensure_ascii: bool = False, 
+    ensure_ascii: bool = True, 
     *, 
     async_: bool = False, 
 ) -> RequestArgs:
@@ -438,7 +441,7 @@ def normalize_request_args(
     elif isinstance(url, URL):
         url = str(url)
     url = complete_url(ensure_str(url))
-    if params and (params := urlencode(params)):
+    if params and (params := urlencode(params, ensure_ascii=ensure_ascii)):
         urlp = urlparse(url)
         if query := urlp.query:
             params = query + "&" + params
@@ -453,7 +456,7 @@ def normalize_request_args(
     content_type = headers_.get("content-type", "")
     charset      = get_charset(content_type)
     mimetype     = get_mimetype(charset).lower()
-    if files is not None:
+    if files:
         headers2, data = encode_multipart_data(
             cast(None | Mapping[string, Any] | Iterable[tuple[string, Any]], data), 
             files, 
@@ -480,7 +483,7 @@ def normalize_request_args(
                 data = dumps(data, default=json_default).encode(charset)
         elif isinstance(data, (Mapping, Sequence)):
             if data:
-                data = urlencode(data, charset).encode(charset)
+                data = urlencode(data, charset, ensure_ascii=ensure_ascii).encode(charset)
                 if mimetype != "application/x-www-form-urlencoded":
                     headers_["content-type"] = "application/x-www-form-urlencoded"
         else:

{python_http_request-0.1.0.1 → python_http_request-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-http_request"
-version = "0.1.0.1"
+version = "0.1.2"
 description = "Python http response utils."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -27,10 +27,10 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.12"
-http_response = ">=0.0.4"
+http_response = ">=0.0.7"
 orjson = "*"
 python-asynctools = ">=0.1.3"
-python-dicttools = ">=0.0.1"
+python-dicttools = ">=0.0.2"
 python-ensure = ">=0.0.1"
 python-filewrap = ">=0.2.8"
 python-texttools = ">=0.0.4"