summaryrefslogtreecommitdiffstats
path: root/ipalib/util.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2015-08-12 12:07:52 +0200
committerJan Cholasta <jcholast@redhat.com>2015-09-01 11:42:01 +0200
commitfbacc26a6a8b92f4b3570c411b186ab86cbcc1b1 (patch)
tree0216c07e276d4441e834a964516d2880858d4650 /ipalib/util.py
parentc27cb295a586cdc1f1cc9b933829db471e5100ed (diff)
downloadfreeipa-fbacc26a6a8b92f4b3570c411b186ab86cbcc1b1.tar.gz
freeipa-fbacc26a6a8b92f4b3570c411b186ab86cbcc1b1.tar.xz
freeipa-fbacc26a6a8b92f4b3570c411b186ab86cbcc1b1.zip
Use six.integer_types instead of (long, int)
Reviewed-By: Christian Heimes <cheimes@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipalib/util.py')
-rw-r--r--ipalib/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipalib/util.py b/ipalib/util.py
index 3b8e59216..3cd23c96e 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -52,7 +52,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, int, long, unicode, NoneType)):
+ if isinstance(obj, (bool, float, unicode, NoneType, six.integer_types)):
return obj
if isinstance(obj, str):
return obj.decode('utf-8')