Revert to HEAD~2

lightbulb/command_handler.py

@@ -794,7 +794,7 @@ class useful for extracting the arguments from the raw string and the property
             conv = converters.pop(0)
             arg_name = arg_names.pop(0)
 
-            if not isinstance(conv, _DefaultingConverter) and not getattr(conv, "unpack", False) and not arg_string:
+            if not isinstance(conv, (_DefaultingConverter, _GreedyConverter)) and not arg_string:
                 raise errors.NotEnoughArguments(command, [arg_name, *arg_names])
 
             try:

lightbulb/commands.py

@@ -188,7 +188,7 @@ def parse_signature(self, signature: inspect.Signature):
             if idx == 0 or (idx == 1 and self.has_self):
                 continue
 
-            converter = base_converter = self.get_converter(param.annotation)
+            converter: _BaseConverter = self.get_converter(param.annotation)
 
             if param.kind is inspect.Parameter.KEYWORD_ONLY:
                 converter = _ConsumeRestConverter(converter, param.name)
@@ -197,9 +197,7 @@ def parse_signature(self, signature: inspect.Signature):
 
             if param.default is not inspect.Parameter.empty:
                 if not isinstance(converter, _DefaultingConverter):
-                    converter = _DefaultingConverter(
-                        converter, param.default, raise_on_fail=not isinstance(base_converter, _GreedyConverter)
-                    )
+                    converter = _DefaultingConverter(converter, param.default)
                 else:
                     converter.default = param.default
 

lightbulb/converters.py

@@ -540,9 +540,6 @@ async def convert(
             except Exception:
                 break
 
-        if not converted and not self.unpack:
-            raise errors.ConverterFailure
-
         return converted, prev