py2api 0.0.4__tar.gz → 0.0.6__tar.gz

{py2api-0.0.4 → py2api-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: py2api
-Version: 0.0.4
+Version: 0.0.6
 Summary: Declarative API entry point
 Project-URL: Homepage, https://github.com/thorwhalen/py2api
 Author: Thor Whalen

{py2api-0.0.4 → py2api-0.0.6}/py2api/py2rest/input_trans.py

@@ -304,8 +304,9 @@ class InputTrans:
                 #     return trans_func
 
                 ############### _ELSE ###############
+                # Only a fallback: a match found above (source, attr or argname) wins.
                 _trans_spec = trans_spec.get(_ELSE, TRANS_NOT_FOUND)
-                if _trans_spec:
+                if trans_func is TRANS_NOT_FOUND and _trans_spec:
                     trans_func = self.search_trans_func(
                         attr, argname, val, trans_spec=_trans_spec, source=source
                     )

py2api-0.0.6/py2api/tests/test_input_trans_else.py

@@ -0,0 +1,21 @@
+"""``_ELSE`` is a fallback: a more specific match must win over it."""
+
+import json
+
+from py2api.constants import _ARGNAME, _ELSE
+from py2api.py2rest.input_trans import InputTrans
+
+SPEC = {_ARGNAME: {"index": int, "source": str}, _ELSE: json.loads}
+
+
+def _found(argname):
+    return InputTrans(trans_spec=SPEC).search_trans_func(None, argname, "val", SPEC)
+
+
+def test_a_matching_argname_beats_else():
+    assert _found("source") is str
+    assert _found("index") is int
+
+
+def test_else_applies_when_nothing_else_matches():
+    assert _found("other") is json.loads

{py2api-0.0.4 → py2api-0.0.6}/py2api/util.py

@@ -45,7 +45,15 @@ def enhanced_docstr(func):
     >>> print(enhanced_docstr(foo))
     foo(a, b=3, c="as", d=SomeClass, dd=some_function, ddd=None, *args, **kwargs)
     some documentation...
-    >>>
+
+    A function with no default arguments keeps all of its positional args
+    (regression: ``args[:-len(dflts)]`` used to drop them all when ``dflts`` was empty):
+
+    >>> def no_defaults(a, b, c):
+    ...     '''some docs'''
+    >>> print(enhanced_docstr(no_defaults))
+    no_defaults(a, b, c)
+    some docs
     """
     argspec = getfullargspec(func)
 
@@ -53,9 +61,13 @@ def enhanced_docstr(func):
     dflts = list(map(_strigify_val, dflts))
 
     args_strings = list()
-    args_strings += argspec.args[: -len(dflts)]
+    # Number of positional (non-default) args. Computed as a length so that the
+    # no-defaults case works: with len(dflts)==0, args[:-0] would wrongly be []
+    # (since -0 == 0), dropping every positional arg.
+    n_positional = len(argspec.args) - len(dflts)
+    args_strings += argspec.args[:n_positional]
     args_strings += [
-        "{}={}".format(*x) for x in zip(argspec.args[-len(dflts) :], dflts)
+        "{}={}".format(*x) for x in zip(argspec.args[n_positional:], dflts)
     ]
     if argspec.varargs is not None:
         args_strings += [f"*{argspec.varargs}"]

{py2api-0.0.4 → py2api-0.0.6}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "py2api"
-version = "0.0.4"
+version = "0.0.6"
 description = "Declarative API entry point"
 readme = "README.md"
 requires-python = ">=3.10"