From ea396528b7e9575b5fcf4902ce9211cf0a67fcc6 Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes@redhat.com>
Date: Wed, 26 Sep 2018 12:33:30 +0200
Subject: Py3: Replace six.integer_types with int

In Python 3, six.integer_types is (int,). In most places, the alias can
be simply replaced with int. In other places, it was possible to
simplify the code by unpacking the tuple.

See: https://pagure.io/freeipa/issue/7715
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
---
 ipapython/cookie.py  | 5 ++---
 ipapython/dn.py      | 4 ++--
 ipapython/ipaldap.py | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'ipapython')

diff --git a/ipapython/cookie.py b/ipapython/cookie.py
index 746facc11..0219c0bf0 100644
--- a/ipapython/cookie.py
+++ b/ipapython/cookie.py
@@ -22,7 +22,6 @@ import datetime
 import email.utils
 from calendar import timegm
 
-import six
 # pylint: disable=import-error
 from six.moves.urllib.parse import urlparse
 # pylint: enable=import-error
@@ -392,7 +391,7 @@ class Cookie:
             self._timestamp = None
         elif isinstance(value, datetime.datetime):
             self._timestamp = value
-        elif isinstance(value, (six.integer_types, float)):
+        elif isinstance(value, (int, float)):
             self._timestamp = datetime.datetime.utcfromtimestamp(value)
         elif isinstance(value, str):
             self._timestamp = Cookie.parse_datetime(value)
@@ -418,7 +417,7 @@ class Cookie:
             self._expires = None
         elif isinstance(value, datetime.datetime):
             self._expires = value
-        elif isinstance(value, (six.integer_types, float)):
+        elif isinstance(value, (int, float)):
             self._expires = datetime.datetime.utcfromtimestamp(value)
         elif isinstance(value, str):
             self._expires = Cookie.parse_datetime(value)
diff --git a/ipapython/dn.py b/ipapython/dn.py
index 45aa4458b..1fca45232 100644
--- a/ipapython/dn.py
+++ b/ipapython/dn.py
@@ -860,7 +860,7 @@ class RDN:
         return len(self._avas)
 
     def __getitem__(self, key):
-        if isinstance(key, six.integer_types):
+        if isinstance(key, int):
             return self._get_ava(self._avas[key])
         if isinstance(key, slice):
             return [self._get_ava(ava) for ava in self._avas[key]]
@@ -1178,7 +1178,7 @@ class DN:
         return len(self.rdns)
 
     def __getitem__(self, key):
-        if isinstance(key, six.integer_types):
+        if isinstance(key, int):
             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 e1c7151da..a35c94c27 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -909,8 +909,7 @@ class LDAPClient:
                 return b'TRUE'
             else:
                 return b'FALSE'
-        elif isinstance(val, (unicode, six.integer_types, Decimal, DN,
-                              Principal)):
+        elif isinstance(val, (unicode, int, Decimal, DN, Principal)):
             return six.text_type(val).encode('utf-8')
         elif isinstance(val, DNSName):
             return val.to_text().encode('ascii')
-- 
cgit