Minor cleanup after adding positional-only arg support

pekkaklarck · pekkaklarck · commit f17a8c4953fc · 2020-10-08T00:33:15.000+03:00
diff --git a/src/robot/running/arguments/argumentspec.py b/src/robot/running/arguments/argumentspec.py
@@ -55,8 +55,7 @@ def positional(self):
 
     @property
     def minargs(self):
-        required = [arg for arg in self.positional if arg not in self.defaults]
-        return len(required)
+        return len([arg for arg in self.positional if arg not in self.defaults])
 
     @property
     def maxargs(self):
diff --git a/src/robot/running/arguments/argumentvalidator.py b/src/robot/running/arguments/argumentvalidator.py
@@ -36,10 +36,10 @@ def validate(self, positional, named, dryrun=False):
         self._validate_no_extra_named(named, self._argspec)
 
     def _validate_no_multiple_values(self, positional, named, spec):
-        for name in (spec.positional_only + spec.positional_or_named)[:len(positional)]:
-            if name in spec.positional_or_named and name in named:
-                raise DataError("%s '%s' got multiple values for argument "
-                                "'%s'." % (spec.type, spec.name, name))
+        for name in spec.positional[:len(positional)]:
+            if name in named and name not in spec.positional_only:
+                raise DataError("%s '%s' got multiple values for argument '%s'."
+                                % (spec.type, spec.name, name))
 
     def _validate_no_positional_only_as_named(self, named, spec):
         if not spec.var_named:
@@ -70,8 +70,8 @@ def _raise_wrong_count(self, count, spec):
                         % (spec.type, spec.name, expected, count))
 
     def _validate_no_mandatory_missing(self, positional, named, spec):
-        for name in spec.positional[len(positional):spec.minargs]:
-            if name not in named:
+        for name in spec.positional[len(positional):]:
+            if name not in spec.defaults and name not in named:
                 raise DataError("%s '%s' missing value for argument '%s'."
                                 % (spec.type, spec.name, name))
 
