Use six.integer_types instead of (long, int)

Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>

3 files changed, 5 insertions, 5 deletions

diff --git a/ipapython/cookie.py b/ipapython/cookie.py
index 8b91457d9..ee54efd7b 100644
--- a/ipapython/cookie.py
+++ b/ipapython/cookie.py
@@ -391,7 +391,7 @@ class Cookie(object):
             self._timestamp = None
         elif isinstance(value, datetime.datetime):
             self._timestamp = value
-        elif isinstance(value, (int, long, float)):
+        elif isinstance(value, (six.integer_types, float)):
             self._timestamp = datetime.datetime.utcfromtimestamp(value)
         elif isinstance(value, six.string_types):
             self._timestamp = Cookie.parse_datetime(value)
@@ -417,7 +417,7 @@ class Cookie(object):
             self._expires = None
         elif isinstance(value, datetime.datetime):
             self._expires = value
-        elif isinstance(value, (int, long, float)):
+        elif isinstance(value, (six.integer_types, float)):
             self._expires = datetime.datetime.utcfromtimestamp(value)
         elif isinstance(value, six.string_types):
             self._expires = Cookie.parse_datetime(value)
diff --git a/ipapython/dn.py b/ipapython/dn.py
index e6d9dbeb5..640be72c3 100644
--- a/ipapython/dn.py
+++ b/ipapython/dn.py
@@ -833,7 +833,7 @@ class RDN(object):
         return len(self._avas)
 
     def __getitem__(self, key):
-        if isinstance(key, (int, long)):
+        if isinstance(key, six.integer_types):
             return self._get_ava(self._avas[key])
         if isinstance(key, slice):
             return [self._get_ava(ava) for ava in self._avas[key]]
@@ -1139,7 +1139,7 @@ class DN(object):
         return len(self.rdns)
 
     def __getitem__(self, key):
-        if isinstance(key, (int, long)):
+        if isinstance(key, six.integer_types):
             return self._get_rdn(self.rdns[key])
         if isinstance(key, slice):
             cls = self.__class__
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py
index 66622ef61..705d694b2 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -831,7 +831,7 @@ class LDAPClient(object):
                 return 'TRUE'
             else:
                 return 'FALSE'
-        elif isinstance(val, (unicode, float, int, long, Decimal, DN)):
+        elif isinstance(val, (unicode, six.integer_types, long, Decimal, DN)):
             return value_to_utf8(val)
         elif isinstance(val, DNSName):
             return str(val)