http2py 0.1.30__tar.gz → 0.1.31__tar.gz

{http2py-0.1.30 → http2py-0.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: http2py
-Version: 0.1.30
+Version: 0.1.31
 Summary: Tools to create python binders to http web services.
 Home-page: https://github.com/i2mint/http2py
 License: Apache
@@ -8,6 +8,14 @@ Keywords: webservice,http,requests,API
 Platform: any
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: glom
+Requires-Dist: i2
+Requires-Dist: ju
+Requires-Dist: requests
+Requires-Dist: argh
+Requires-Dist: PyYAML
+Requires-Dist: importlib_resources
+Dynamic: license-file
 
 [Documentation here](https://i2mint.github.io/http2py/)
 

{http2py-0.1.30 → http2py-0.1.31}/http2py/authentication.py

@@ -1,7 +1,7 @@
 import json
 import os
 from pathlib import Path
-from typing import Iterable
+from collections.abc import Iterable
 
 DFLT_CONFIG_FILENAME = os.path.join(Path.home(), ".http2py", "credentials.json")
 

{http2py-0.1.30 → http2py-0.1.31}/http2py/cli_maker.py

@@ -6,7 +6,7 @@ import json
 import os
 from pathlib import Path
 import requests
-from typing import Callable, Iterable
+from collections.abc import Callable, Iterable
 import yaml
 
 from i2.io_trans import JSONAnnotAndDfltIoTrans

{http2py-0.1.30 → http2py-0.1.31}/http2py/example_cli.py

@@ -1,5 +1,5 @@
 import argh
-from typing import Iterable
+from collections.abc import Iterable
 
 from http2py.cli_maker import mk_argparse_friendly
 from i2.io_trans import AnnotAndDfltIoTrans

{http2py-0.1.30 → http2py-0.1.31}/http2py/py2request.py

@@ -66,7 +66,7 @@ with I2mintModuleNotFoundErrorNiceMessage():
     from i2.signatures import set_signature_of_func, KO
 
 DFLT_PORT = 5000
-DFLT_BASE_URL = "http://localhost:{port}".format(port=DFLT_PORT)
+DFLT_BASE_URL = f"http://localhost:{DFLT_PORT}"
 DFLT_REQUEST_METHOD = "post"
 DFLT_REQUEST_KWARGS = imdict({"method": DFLT_REQUEST_METHOD, "url": ""})
 
@@ -227,7 +227,7 @@ def mk_request_function(
         if "url_template" in method_spec:
             url_template = method_spec["url_template"]
             # Check if the url template already has parameters, add them otherwise
-            if query_arg_names and not re.search("^.*\?((.*=.*)(&?))+$", url_template):
+            if query_arg_names and not re.search(r"^.*\?((.*=.*)(&?))+$", url_template):
                 url_arg_parts = [f"{x}={{{x}}}" for x in query_arg_names if x in kwargs]
                 url_args = "&".join(url_arg_parts)
                 if url_args:
@@ -316,7 +316,7 @@ DFLT_METHOD_FUNC_FROM_METHOD_SPEC = mk_request_function
 str_formatter = string.Formatter()
 
 
-class Py2Request(object):
+class Py2Request:
     """Make a class that has methods that offer a python interface to web requests"""
 
     def __init__(
@@ -653,8 +653,9 @@ def mk_method_spec_from_openapi_method_spec(
 
 ##### Open api stuff TODO: To move ###########################################
 from inspect import Parameter, Signature
-from typing import Union, Callable, Iterable
-from typing import Mapping as MappingType
+from typing import Union
+from collections.abc import Callable, Iterable
+from collections.abc import Mapping as MappingType
 
 PK = Parameter.POSITIONAL_OR_KEYWORD
 
@@ -755,7 +756,8 @@ def mk_request_func_from_openapi_spec(
 mk_request_function.from_openapi_spec = mk_request_func_from_openapi_spec
 
 
-from typing import Optional, Iterable, Dict, Tuple, Callable
+from typing import Optional, Dict, Tuple
+from collections.abc import Iterable, Callable
 from ju.oas import Routes
 from http2py.py2request import mk_request_func_from_openapi_spec
 
@@ -773,12 +775,12 @@ def default_path_to_func_name(method: str, uri: str) -> str:
 
 def openapi_to_py(
     openapi_spec: dict,
-    paths: Optional[Iterable[Tuple[str, str]]] = None,
+    paths: Iterable[tuple[str, str]] | None = None,
     *,
     path_to_func_name: Callable[[str, str], str] = default_path_to_func_name,
-    servers: Optional[list] = None,
+    servers: list | None = None,
     default_server_url: str = "http://localhost:8000",
-) -> Dict[str, Callable]:
+) -> dict[str, Callable]:
     """
     Given an OpenAPI spec dict, returns a dict mapping function names to request functions.
     The `servers` argument overrides or provides a default for the OpenAPI servers field.

{http2py-0.1.30 → http2py-0.1.31}/http2py/util.py

@@ -26,8 +26,7 @@ class ModuleNotFoundErrorNiceMessage:
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_type is ModuleNotFoundError:
-            raise ModuleNotFoundError(
-                f"""
+            raise ModuleNotFoundError(f"""
 It seems you don't have requred `{exc_val.name}` package.
 Try installing it by running:
 
@@ -35,8 +34,7 @@ Try installing it by running:
 
 in your terminal.
 For more information: https://pypi.org/project/{exc_val.name}
-            """
-            )
+            """)
 
 
 class I2mintModuleNotFoundErrorNiceMessage:
@@ -45,13 +43,11 @@ class I2mintModuleNotFoundErrorNiceMessage:
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_type is ModuleNotFoundError:
-            raise ModuleNotFoundError(
-                f"""
+            raise ModuleNotFoundError(f"""
 It seems you don't have requred `{exc_val.name}` package. Not sure if this is the problem, but you could try:
     git clone https://github.com/i2mint/{exc_val.name}
 in a place that your python path (i.e. PYTHONPATH environment variable).  
-            """
-            )
+            """)
 
 
 def is_jsonable(x):

{http2py-0.1.30 → http2py-0.1.31}/http2py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: http2py
-Version: 0.1.30
+Version: 0.1.31
 Summary: Tools to create python binders to http web services.
 Home-page: https://github.com/i2mint/http2py
 License: Apache
@@ -8,6 +8,14 @@ Keywords: webservice,http,requests,API
 Platform: any
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: glom
+Requires-Dist: i2
+Requires-Dist: ju
+Requires-Dist: requests
+Requires-Dist: argh
+Requires-Dist: PyYAML
+Requires-Dist: importlib_resources
+Dynamic: license-file
 
 [Documentation here](https://i2mint.github.io/http2py/)
 

{http2py-0.1.30 → http2py-0.1.31}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = http2py
-version = 0.1.30
+version = 0.1.31
 url = https://github.com/i2mint/http2py
 root_url = https://github.com/i2mint
 platforms = any