mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Convert list to tuples
Some tests assume that JSON deserializier returns tuples instead of lists. I don't think it is necessary but let's pass the tests for now. Signed-off-by: Christian Heimes <cheimes@redhat.com> Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
committed by
Martin Basti
parent
8159c2883b
commit
b12b1e4c0b
@@ -388,7 +388,7 @@ def json_encode_binary(val, version):
|
||||
return json.dumps(result)
|
||||
|
||||
|
||||
def _ipa_obj_hook(dct):
|
||||
def _ipa_obj_hook(dct, _iteritems=six.iteritems, _list=list):
|
||||
if '__base64__' in dct:
|
||||
return base64.b64decode(dct['__base64__'])
|
||||
elif '__datetime__' in dct:
|
||||
@@ -397,6 +397,10 @@ def _ipa_obj_hook(dct):
|
||||
elif '__dns_name__' in dct:
|
||||
return DNSName(dct['__dns_name__'])
|
||||
else:
|
||||
# XXX tests assume tuples. Is this really necessary?
|
||||
for k, v in _iteritems(dct):
|
||||
if v.__class__ is _list:
|
||||
dct[k] = tuple(v)
|
||||
return dct
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user