diff options
| author | Christian Heimes <cheimes@redhat.com> | 2017-02-13 10:46:36 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-02-15 17:27:56 +0100 |
| commit | b12b1e4c0b19a84ccffcc702ab608d818382a697 (patch) | |
| tree | 5b2b9a3df05ac86bdd10b68afca158a0314d9491 | |
| parent | 8159c2883bf66980582d1227c364df4e592bdd7e (diff) | |
| download | freeipa-b12b1e4c0b19a84ccffcc702ab608d818382a697.tar.gz freeipa-b12b1e4c0b19a84ccffcc702ab608d818382a697.tar.xz freeipa-b12b1e4c0b19a84ccffcc702ab608d818382a697.zip | |
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>
| -rw-r--r-- | ipalib/rpc.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ipalib/rpc.py b/ipalib/rpc.py index d8207dcd6..8e9d1e3b0 100644 --- a/ipalib/rpc.py +++ b/ipalib/rpc.py @@ -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 |