cli2 4.1.2__tar.gz → 4.1.4__tar.gz

{cli2-4.1.2/cli2.egg-info → cli2-4.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 4.1.2
+Version: 4.1.4
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-4.1.2 → cli2-4.1.4}/cli2/cli.py

@@ -1129,7 +1129,7 @@ class Argument:
         # priority to varkwargs for word= and **{}
         last = self.cmd[[*self.cmd.keys()][-1]]
         if last is not self and last.param.kind == self.param.VAR_KEYWORD:
-            if re.match('^-?-?[^=]+=', arg):
+            if re.match('^-?-?[\\w]+=', arg):
                 return
             elif arg.startswith('**{') and arg.endswith('}'):
                 return
@@ -1163,7 +1163,7 @@ class Argument:
         If the factory function takes an `arg` argument, it will pass self.
 
         It will forward any argument to the factory function if detected in
-        it's signature.
+        it's signature, except for ``*args`` and ``**kwargs``.
         """
         kwargs = dict()
         sig = inspect.signature(self.factory)
@@ -1171,7 +1171,14 @@ class Argument:
             kwargs['cmd'] = self.cmd
         if 'arg' in sig.parameters:
             kwargs['arg'] = self
+
+        excluded = (
+            inspect.Parameter.VAR_KEYWORD,
+            inspect.Parameter.VAR_POSITIONAL,
+        )
         for key, arg in self.cmd.items():
+            if arg.param.kind in excluded:
+                continue
             if key in sig.parameters:
                 kwargs[key] = arg.value
         return self.factory(**kwargs)

{cli2-4.1.2 → cli2-4.1.4/cli2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 4.1.2
+Version: 4.1.4
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-4.1.2 → cli2-4.1.4}/setup.py

@@ -44,7 +44,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='4.1.2',
+    version='4.1.4',
     setup_requires='setupmeta',
     packages=['cli2'],
     install_requires=[

{cli2-4.1.2 → cli2-4.1.4}/tests/test_cli.py

@@ -9,6 +9,8 @@ def test_call():
     result = main('cli2.examples.test.example_function', 'x', 'y=z')
     assert "args=('x',)" in result
     assert "kwargs={'y': 'z'}" in result
+    result = main('cli2.examples.test.example_function', 'http://?x=bar')
+    assert "args=('http://?x=bar',)" in result
 
 
 def test_doc_by_default(mocker):

{cli2-4.1.2 → cli2-4.1.4}/tests/test_command.py

@@ -108,12 +108,12 @@ def test_positional_only_looksahead():
         return (one, two)
     cmd = cli2.Command(foo)
 
-    cmd.parse('y.-7=e', 'three=z', 'x', 'y')
+    cmd.parse('z=w', 'three=z', 'x', 'y')
     assert cmd['one'].value == 'x'
     assert cmd['two'].value == ['y']
     assert cmd['three'].value == 'z'
     # make sure it takes weird keywords too
-    assert cmd['kwargs'].value['y.-7'] == 'e'
+    assert cmd['kwargs'].value['z'] == 'w'
 
 
 def test_keyword_only():