alemi/treepuncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sort union types so str comes last

Browse source
This commit is contained in:
əlemi 2022-04-23 15:55:19 +02:00
parent 977ce7a9de
commit 086e59a0ce
No known key found for this signature in database
GPG key ID: F239DD0985A7A5E9
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/treepuncher/treepuncher.py
View file

@ -28,7 +28,11 @@ def parse_with_hint(val:str, hint:Any) -> Any:
return False return False
if hint is list or get_origin(hint) is list: if hint is list or get_origin(hint) is list:
if get_args(hint): if get_args(hint):
return [ parse_with_hint(x, get_args(hint)[0]) for x in val.split() ] return list( parse_with_hint(x, get_args(hint)[0]) for x in val.split() )
return val.split()
if hint is tuple or get_origin(hint) is tuple:
if get_args(hint):
return tuple( parse_with_hint(x, get_args(hint)[0]) for x in val.split() )
return val.split() return val.split()
if hint is set or get_origin(hint) is set: if hint is set or get_origin(hint) is set:
if get_args(hint): if get_args(hint):
@ -37,7 +41,9 @@ def parse_with_hint(val:str, hint:Any) -> Any:
if hint is dict or get_origin(hint) is dict: if hint is dict or get_origin(hint) is dict:
return json.loads(val) return json.loads(val)
if hint is Union or get_origin(hint) is Union: if hint is Union or get_origin(hint) is Union:
for t in get_args(hint): # TODO str will never fail, should be tried last.
# cheap fix: sort keys by name so that "str" comes last
for t in sorted(get_args(hint), key=lambda x : str(x)):
try: try:
return t(val) return t(val)
except ValueError: except ValueError: