diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-09-17 17:56:45 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-10-07 10:27:20 +0200 |
| commit | e3c05fcb73c5a1081167d73278785bf18d652dab (patch) | |
| tree | 2e812fea2e20b5808371975da090a829dd5c66f3 /ipalib/util.py | |
| parent | 65e3b9edc66d7dfe885df143c16a59588af8192f (diff) | |
| download | freeipa-e3c05fcb73c5a1081167d73278785bf18d652dab.tar.gz freeipa-e3c05fcb73c5a1081167d73278785bf18d652dab.tar.xz freeipa-e3c05fcb73c5a1081167d73278785bf18d652dab.zip | |
Remove uses of the `types` module
In Python 3, the types module no longer provide alternate names for
built-in types, e.g. `types.StringType` can just be spelled `str`.
NoneType is also removed; it needs to be replaced with type(None)
Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipalib/util.py')
| -rw-r--r-- | ipalib/util.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipalib/util.py b/ipalib/util.py index 7c7da6af7..a37f67342 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -29,7 +29,6 @@ import re import decimal import dns import encodings -from types import NoneType from weakref import WeakKeyDictionary import netaddr @@ -55,7 +54,7 @@ def json_serialize(obj): return [json_serialize(o) for o in obj] if isinstance(obj, dict): return {k: json_serialize(v) for (k, v) in obj.items()} - if isinstance(obj, (bool, float, unicode, NoneType, six.integer_types)): + if isinstance(obj, (bool, float, unicode, type(None), six.integer_types)): return obj if isinstance(obj, str): return obj.decode('utf-8') |