python-http_request 0.0.7__tar.gz → 0.0.7.1__tar.gz

{python_http_request-0.0.7 → python_http_request-0.0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-http_request
-Version: 0.0.7
+Version: 0.0.7.1
 Summary: Python http response utils.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-http_request
 License: MIT

{python_http_request-0.0.7 → python_http_request-0.0.7.1}/http_request/__init__.py

@@ -26,7 +26,7 @@ from texttools import text_to_dict
 
 AnyStr = TypeVar("AnyStr", bytes, str, covariant=True)
 
-CRE_URL_SCHEME: Final = re_compile(r"^(?i:[a-z][a-z0-9.+-]*)://")
+CRE_URL_SCHEME_match: Final = re_compile(r"(?i:[a-z][a-z0-9.+-]*)://").match
 
 
 @runtime_checkable
@@ -34,27 +34,41 @@ class SupportsGeturl(Protocol[AnyStr]):
     def geturl(self) -> AnyStr: ...
 
 
-def url_origin(url: str, /) -> str:
-    if url.startswith("://"):
+def url_origin(url: str, /, default_port: int = 0) -> str:
+    if url.startswith("/"):
+        url = "http://localhost" + url
+    elif url.startswith("//"):
+        url = "http:" + url
+    elif url.startswith("://"):
         url = "http" + url
-    elif CRE_URL_SCHEME.match(url) is None:
+    elif not CRE_URL_SCHEME_match(url):
         url = "http://" + url
     urlp = urlsplit(url)
-    scheme, netloc = urlp.scheme, urlp.netloc
-    if not netloc:
-        netloc = "localhost"
+    scheme, netloc = urlp.scheme or "http", urlp.netloc or "localhost"
+    if default_port and not urlp.port:
+        netloc = netloc.removesuffix(":") + f":{default_port}"
     return f"{scheme}://{netloc}"
 
 
-def complete_url(url: str, /) -> str:
-    if url.startswith("://"):
+def complete_url(url: str, /, default_port: int = 0) -> str:
+    if url.startswith("/"):
+        url = "http://localhost" + url
+    elif url.startswith("//"):
+        url = "http:" + url
+    elif url.startswith("://"):
         url = "http" + url
-    elif CRE_URL_SCHEME.match(url) is None:
+    elif not CRE_URL_SCHEME_match(url):
         url = "http://" + url
     urlp = urlsplit(url)
     repl = {"query": "", "fragment": ""}
-    if not urlp.netloc:
-        repl["path"] = "localhost"
+    if not urlp.scheme:
+        repl["scheme"] = "http"
+    netloc = urlp.netloc
+    if not netloc:
+        netloc = "localhost"
+    if default_port and not urlp.port:
+        netloc = netloc.removesuffix(":") + f":{default_port}"
+    repl["netloc"] = netloc
     return urlunsplit(urlp._replace(**repl)).rstrip("/")
 
 

{python_http_request-0.0.7 → python_http_request-0.0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-http_request"
-version = "0.0.7"
+version = "0.0.7.1"
 description = "Python http response utils."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"