diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2012-09-05 14:35:44 +0200 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2012-09-06 10:27:10 +0200 |
commit | 07cae43484911ddf87b87d7d3399f7b09378f8fe (patch) | |
tree | 699208a7a584a7bc03b6a6fc2f7389a43d8243c7 /ipalib/util.py | |
parent | 6a8d6d3fde0ede2e0b976cd5af67a57c0691b1f8 (diff) | |
download | freeipa-07cae43484911ddf87b87d7d3399f7b09378f8fe.tar.gz freeipa-07cae43484911ddf87b87d7d3399f7b09378f8fe.tar.xz freeipa-07cae43484911ddf87b87d7d3399f7b09378f8fe.zip |
Fixed metadata serialization of Numbers and DNs
There were following problems:
1. DNs and Decimals weren't properly serialized. Serialization output was object with empty __base64__ attribute. It was fixed by converting them to string.
2. numberical values equal to 0 were excluded from metadata. It broke many of minvalue checks in Web UI. Now excluding only None and False values as initally intended.
https://fedorahosted.org/freeipa/ticket/3052
Diffstat (limited to 'ipalib/util.py')
-rw-r--r-- | ipalib/util.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ipalib/util.py b/ipalib/util.py index 44f08e7f6..155d93294 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -26,6 +26,7 @@ import imp import time import socket import re +import decimal from types import NoneType from weakref import WeakKeyDictionary from dns import resolver, rdatatype @@ -46,6 +47,8 @@ def json_serialize(obj): return obj if isinstance(obj, str): return obj.decode('utf-8') + if isinstance(obj, (decimal.Decimal, DN)): + return str(obj) if not callable(getattr(obj, '__json__', None)): # raise TypeError('%r is not JSON serializable') return '' |