rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure typing.Union[str, int] gets handled

Browse Source 
str always needs to be the last element checked as otherwise it'd always
win.
This commit is contained in:
Florian Bruhin 2016-05-17 08:40:12 +02:00
parent a0d0b6464f
commit 6ed9b6b13f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qutebrowser/commands/argparser.py
View File

@ -161,9 +161,16 @@ def multitype_conv(param, types, str_choices=None):
types: The allowed types ("overloads") types: The allowed types ("overloads")
str_choices: The allowed choices if the type ends up being a string str_choices: The allowed choices if the type ends up being a string
""" """
types = list(set(types))
if str in types:
# Make sure str is always the last type in the list, so e.g. '23' gets
# returned as 23 if we have typing.Union[str, int]
types.remove(str)
types.append(str)
def _convert(value): def _convert(value):
"""Convert a value according to an iterable of possible arg types.""" """Convert a value according to an iterable of possible arg types."""
for typ in set(types): for typ in types:
try: try:
converter = type_conv(param, typ, str_choices) converter = type_conv(param, typ, str_choices)
return converter(value) return converter(value)

1
tests/unit/commands/test_argparser.py
View File

@ -92,6 +92,7 @@ class TestArgumentParser:
([int], '2.5', None), ([int], '2.5', None),
([int], 'foo', None), ([int], 'foo', None),
([int, str], 'foo', 'foo'), ([int, str], 'foo', 'foo'),
([str, int], '23', 23),
]) ])
@pytest.mark.parametrize('multi', [True, False]) @pytest.mark.parametrize('multi', [True, False])
def test_type_conv(types, value, expected, multi): def test_type_conv(types, value, expected, multi):