Change: Fix constructor signature of InvalidArgumentType exception

The argument must not be None and arg_type may be optional.

Author: bjoernricks

Diff for: gvm/errors.py

@@ -132,9 +132,9 @@ class InvalidArgumentType(GvmError):
 
     def __init__(
         self,
-        argument: str = None,
-        arg_type: str = None,
+        argument: str,
         *,
+        arg_type: Optional[str] = None,
         function: Optional[str] = None,
     ):
         super().__init__(None)
@@ -144,11 +144,21 @@ def __init__(
 
     def __str__(self):
         if self.function:
+            if self.arg_type:
+                return (
+                    f"In {self.function} the argument {self.argument} "
+                    f"must be of type {self.arg_type}."
+                )
             return (
-                f"In {self.function} the argument {self.argument} "
-                f"must be of type {self.arg_type}."
+                f"Invalid argument type for argument {self.argument} in "
+                f"{self.function}."
             )
-        return f"The argument {self.argument} must be of type {self.arg_type}."
+        if self.arg_type:
+            return (
+                f"The argument {self.argument} must be of type {self.arg_type}."
+            )
+
+        return f"Invalid argument type for argument {self.argument}."
 
 
 class RequiredArgument(GvmError):

Diff for: tests/test_errors.py

@@ -180,25 +180,25 @@ def test_raise_with_argument_and_arg_type(self):
         with self.assertRaisesRegex(
             InvalidArgumentType, "^The argument foo must be of type bar.$"
         ):
-            raise InvalidArgumentType("foo", "bar")
+            raise InvalidArgumentType("foo", arg_type="bar")
 
     def test_raise_with_function(self):
         with self.assertRaisesRegex(
             InvalidArgumentType,
             "^In baz the argument foo must be of type bar.$",
         ):
-            raise InvalidArgumentType("foo", "bar", function="baz")
+            raise InvalidArgumentType("foo", arg_type="bar", function="baz")
 
     def test_string_conversion(self):
         with self.assertRaises(InvalidArgumentType) as cm:
-            raise InvalidArgumentType("foo", "bar")
+            raise InvalidArgumentType("foo", arg_type="bar")
 
         ex = cm.exception
         self.assertEqual(str(ex), "The argument foo must be of type bar.")
         self.assertIsNone(ex.function)
 
         with self.assertRaises(InvalidArgumentType) as cm:
-            raise InvalidArgumentType("foo", "bar", function="baz")
+            raise InvalidArgumentType("foo", arg_type="bar", function="baz")
 
         ex = cm.exception
         self.assertEqual(
@@ -207,7 +207,7 @@ def test_string_conversion(self):
 
     def test_is_gvm_error(self):
         with self.assertRaises(GvmError):
-            raise InvalidArgumentType("foo", "bar")
+            raise InvalidArgumentType("foo", arg_type="bar")
 
 
 if __name__ == "__main__":