misc

cyclopts/bind.py

@@ -105,8 +105,10 @@ def remaining_parameters():
         if parameter.kind == parameter.VAR_POSITIONAL:  # ``*args``
             f_args.extend(_coerce_pos(parameter, x) for x in tokens)
             break
-        elif parameter.kind in (parameter.POSITIONAL_ONLY, parameter.POSITIONAL_OR_KEYWORD):
+        elif parameter.kind == parameter.POSITIONAL_ONLY:
             f_args.append(_coerce_pos(parameter, tokens.popleft()))
+        elif parameter.kind == parameter.POSITIONAL_OR_KEYWORD:
+            f_kwargs[parameter.name] = _coerce_pos(parameter, tokens.popleft())
         else:
             raise UnreachableError("Not expected to get here.")
 

tests/bind/test_basic.py

@@ -18,22 +18,26 @@ def foo(a, b, c):
             pass
 
 
-def test_basic_1(app):
+@pytest.mark.parametrize(
+    "cmd_str",
+    [
+        "foo 1 2 3",
+        "foo --a 1 --b 2 --c 3",
+        "foo --c 3 1 2",
+        "foo --c 3 --b=2 1",
+        "foo --c 3 --b=2 --a 1",
+        "foo 1 --b=2 3",
+    ],
+)
+def test_basic_1(app, cmd_str):
     @app.command
     def foo(a: int, b: int, c: int):
         pass
 
     signature = inspect.signature(foo)
     expected_bind = signature.bind(1, 2, 3)
 
-    def run(s):
-        actual_command, actual_bind, unused_args = app.parse_known_args(s)
-        assert actual_command == foo
-        assert actual_bind == expected_bind
-        assert unused_args == []
-
-    run("foo 1 2 3")
-    run("foo --a 1 --b 2 --c 3")
-    run("foo --c 3 1 2")
-    run("foo --c 3 --b=2 1")
-    run("foo --c 3 --b=2 --a 1")
+    actual_command, actual_bind, unused_args = app.parse_known_args(cmd_str)
+    assert actual_command == foo
+    assert actual_bind == expected_bind
+    assert unused_args == []