danvics/ytdl-sub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sorted union

Browse source
This commit is contained in:
Jesse Bannon 2023-12-07 13:32:05 -08:00
parent 6ad5c47068
commit 21e58dbb25
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ytdl_sub/script/utils/exception_formatters.py
View file

@ -113,7 +113,9 @@ class FunctionArgumentsExceptionFormatter:
if is_optional(python_type): if is_optional(python_type):
return f"Optional[{cls._to_human_readable_name(get_optional_type(python_type))}]" return f"Optional[{cls._to_human_readable_name(get_optional_type(python_type))}]"
if is_union(python_type): if is_union(python_type):
return ", ".join(cls._to_human_readable_name(arg) for arg in python_type.__args__) return ", ".join(
sorted(cls._to_human_readable_name(arg) for arg in python_type.__args__)
)
return python_type.type_name() return python_type.type_name()
def _expected_args_str(self) -> str: def _expected_args_str(self) -> str:
@ -130,7 +132,7 @@ class FunctionArgumentsExceptionFormatter:
if is_union(arg.output_type()): if is_union(arg.output_type()):
received_type_names.append( received_type_names.append(
f"%{arg.name}(...)->Union[" f"%{arg.name}(...)->Union["
f"{', '.join(type_.type_name() for type_ in arg.output_type().__args__)}" f"{', '.join(sorted(type_.type_name() for type_ in arg.output_type().__args__))}"
f"]" f"]"
) )
else: else:

2
tests/unit/script/types/test_function.py
View file

@ -41,7 +41,7 @@ class TestFunction:
IncompatibleFunctionArguments, IncompatibleFunctionArguments,
match=_incompatible_arguments_match( match=_incompatible_arguments_match(
expected="Map, Hashable, Optional[AnyArgument]", expected="Map, Hashable, Optional[AnyArgument]",
recieved="%if(...)->Union[Map, Array], String", recieved="%if(...)->Union[Array, Map], String",
), ),
): ):
Script({"func": function_str}).resolve() Script({"func": function_str}).resolve()