RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved handling of .json() helper handling. By dumping it with the JsonEncoder and loading it back in we ensure that any recursive objects also meers the json friendly dict criterias. (#1689)

This commit is contained in:
Anton Hvornum 2023-03-26 22:05:52 +02:00 committed by GitHub
parent 942112f871
commit ef5011114d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archinstall/lib/general.py
View File

@ -130,7 +130,10 @@ class JsonEncoder:
copy[JsonEncoder._encode(key)] = val copy[JsonEncoder._encode(key)] = val
return copy return copy
elif hasattr(obj, 'json'): elif hasattr(obj, 'json'):
return obj.json() # json() is a friendly name for json-helper, it should return
# a dictionary representation of the object so that it can be
# processed by the json library.
return json.loads(json.dumps(obj.json(), cls=JSON))
elif hasattr(obj, '__dump__'): elif hasattr(obj, '__dump__'):
return obj.__dump__() return obj.__dump__()
elif isinstance(obj, (datetime, date)): elif isinstance(obj, (datetime, date)):