remove py2 compatibility

adorton-adobe · adorton-adobe · commit 769107d5b79f · 2021-01-29T09:44:31.000-07:00
diff --git a/setup.py b/setup.py
@@ -54,8 +54,6 @@
           'requests>=2.4.2',
           'cryptography==3.3.1',
           'PyJWT==2.0.1',
-          'six',
-          'enum34;python_version<"3.4"',
       ],
       extras_require={
           'test': test_deps,
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -24,7 +24,7 @@
 import logging
 
 import pytest
-from six import StringIO
+from io import StringIO
 
 mock_connection_params = {
     "org_id": "N/A",
diff --git a/tests/test_connections.py b/tests/test_connections.py
@@ -24,7 +24,6 @@
 import mock
 import pytest
 import requests
-import six
 
 from conftest import mock_connection_params, MockResponse
 
@@ -310,7 +309,7 @@ def test_large_group_assignment_split():
     :return:
     """
     group_prefix = "G"
-    add_groups = [group_prefix+six.text_type(n+1) for n in range(0, 15)]
+    add_groups = [group_prefix+str(n+1) for n in range(0, 15)]
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="user@example.com")
     user.add_to_groups(groups=add_groups, group_type=GroupTypes.usergroup)
     assert user.maybe_split_groups(10) is True
@@ -325,7 +324,7 @@ def test_large_group_assignment_split_recursive():
     :return:
     """
     group_prefix = "G"
-    add_groups = [group_prefix+six.text_type(n+1) for n in range(0, 100)]
+    add_groups = [group_prefix+str(n+1) for n in range(0, 100)]
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="user@example.com")
     user.add_to_groups(groups=add_groups, group_type=GroupTypes.usergroup)
     assert user.maybe_split_groups(10) is True
@@ -339,8 +338,8 @@ def test_large_group_mix_split():
     :return:
     """
     group_prefix = "G"
-    add_groups = [group_prefix+six.text_type(n+1) for n in range(0, 15)]
-    remove_groups = [group_prefix+six.text_type(n+1) for n in range(15, 30)]
+    add_groups = [group_prefix+str(n+1) for n in range(0, 15)]
+    remove_groups = [group_prefix+str(n+1) for n in range(15, 30)]
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="user@example.com")
     user.add_to_groups(groups=add_groups, group_type=GroupTypes.usergroup) \
         .remove_from_groups(groups=remove_groups, group_type=GroupTypes.usergroup)
@@ -364,7 +363,7 @@ def test_large_group_action_split():
         conn = Connection(**mock_connection_params)
 
         group_prefix = "G"
-        add_groups = [group_prefix+six.text_type(n+1) for n in range(0, 150)]
+        add_groups = [group_prefix+str(n+1) for n in range(0, 150)]
         user = UserAction(id_type=IdentityTypes.enterpriseID, email="user@example.com")
         user.add_to_groups(groups=add_groups, group_type=GroupTypes.usergroup)
         assert conn.execute_single(user, immediate=True) == (0, 2, 2)
@@ -382,7 +381,7 @@ def test_group_size_limit():
         conn = Connection(**params)
 
         group_prefix = "G"
-        add_groups = [group_prefix+six.text_type(n+1) for n in range(0, 150)]
+        add_groups = [group_prefix+str(n+1) for n in range(0, 150)]
         user = UserAction(id_type=IdentityTypes.enterpriseID, email="user@example.com")
         user.add_to_groups(groups=add_groups, group_type=GroupTypes.usergroup)
         assert conn.execute_single(user, immediate=True) == (0, 3, 3)
@@ -409,7 +408,7 @@ def test_split_add_user():
 
 def test_split_role_assignment():
     group_prefix = "G"
-    add_groups = [group_prefix+six.text_type(n+1) for n in range(0, 25)]
+    add_groups = [group_prefix+str(n+1) for n in range(0, 25)]
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="user@example.com")
     user.add_role(groups=add_groups, role_type=RoleTypes.admin)
     assert user.maybe_split_groups(10) is True
@@ -422,7 +421,7 @@ def test_no_group_split():
     :return:
     """
     group_prefix = "G"
-    add_groups = [group_prefix+six.text_type(n+1) for n in range(0, 5)]
+    add_groups = [group_prefix+str(n+1) for n in range(0, 5)]
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="user@example.com")
     user.add_to_groups(groups=add_groups, group_type=GroupTypes.usergroup)
     assert user.maybe_split_groups(10) is False
@@ -436,8 +435,8 @@ def test_complex_group_split():
     :return:
     """
     group_prefix = "G"
-    add_groups = [group_prefix+six.text_type(n+1) for n in range(0, 150)]
-    add_products = [group_prefix+six.text_type(n+1) for n in range(0, 26)]
+    add_groups = [group_prefix+str(n+1) for n in range(0, 150)]
+    add_products = [group_prefix+str(n+1) for n in range(0, 26)]
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="user@example.com")
     user.commands = [{
         "add": {
@@ -457,7 +456,7 @@ def test_split_remove_all():
     :return:
     """
     group_prefix = "G"
-    add_groups = [group_prefix+six.text_type(n+1) for n in range(0, 11)]
+    add_groups = [group_prefix+str(n+1) for n in range(0, 11)]
     user = UserAction(id_type=IdentityTypes.enterpriseID, email="user@example.com")
     user.remove_from_groups(all_groups=True)
     assert user.maybe_split_groups(1) is False
@@ -480,7 +479,7 @@ def test_split_remove_all():
 
 
 def test_split_group_action():
-    user_template = six.text_type("user.{}@example.com")
+    user_template = "user.{}@example.com"
     add_users = [user_template.format(n+1) for n in range(0, 25)]
     group = UserGroupAction(group_name="Test Group")
     group.add_users(users=add_users)
diff --git a/tests/test_functional.py b/tests/test_functional.py
@@ -21,8 +21,6 @@
 # SOFTWARE.
 
 import pytest
-import six
-import mock
 
 from conftest import mock_connection_params, MockResponse
 from umapi_client import ArgumentError, RequestError
diff --git a/tests/test_legacy.py b/tests/test_legacy.py
@@ -26,7 +26,7 @@
 import mock
 import pytest
 from conftest import MockResponse
-from six import StringIO
+from io import StringIO
 
 import umapi_client.legacy as v1
 
diff --git a/tests/test_live.py b/tests/test_live.py
@@ -24,7 +24,6 @@
 
 import pytest
 import yaml
-import six
 
 import umapi_client
 
@@ -134,7 +133,7 @@ def test_get_user(config):
     user_query = umapi_client.UserQuery(conn, params["test_user"]["email"])
     user = user_query.result()
     logging.info("User: %s", user)
-    for k, v in six.iteritems(params["test_user"]):
+    for k, v in params["test_user"].items():
         assert user[k].lower() == v.lower()
 
 
diff --git a/umapi_client/api.py b/umapi_client/api.py
@@ -18,8 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import six
-
 from .connection import Connection
 
 
@@ -76,7 +74,7 @@ def append(self, **kwargs):
         :param kwargs: the key/value pairs to add
         :return: the action
         """
-        for k, v in six.iteritems(kwargs):
+        for k, v in kwargs.items():
             self.commands.append({k: v})
         return self
 
@@ -95,7 +93,7 @@ def insert(self, **kwargs):
         :param kwargs: the key/value pair to append first
         :return: the action, so you can append Action(...).insert(...).append(...)
         """
-        for k, v in six.iteritems(kwargs):
+        for k, v in kwargs.items():
             self.commands.insert(0, {k: v})
         return self
 
@@ -139,14 +137,14 @@ def maybe_split_groups(self, max_groups):
         valid_step_keys = ['add', 'addRoles', 'remove']
         for command in self.commands:
             # commands are assumed to contain a single key
-            step_key, step_args = next(six.iteritems(command))
+            step_key, step_args = next(iter(command.items()))
             if step_key not in valid_step_keys or not isinstance(step_args, dict):
                 split_commands.append(command)
                 continue
             new_commands = [command]
             while True:
                 new_command = {step_key: {}}
-                for group_type, groups in six.iteritems(command[step_key]):
+                for group_type, groups in command[step_key].items():
                     if len(groups) > max_groups:
                         command[step_key][group_type], new_command[step_key][group_type] = \
                             groups[0:max_groups], groups[max_groups:]
diff --git a/umapi_client/auth.py b/umapi_client/auth.py
@@ -23,7 +23,7 @@
 
 import jwt  # package name is PyJWT in setup
 import requests
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 
 
 class JWT(object):
diff --git a/umapi_client/connection.py b/umapi_client/connection.py
@@ -26,8 +26,8 @@
 from random import randint
 from time import time, sleep, gmtime, strftime
 import requests
-import six
-import six.moves.urllib.parse as urlparse
+import io
+import urllib.parse as urlparse
 
 from .auth import JWT, Auth, AccessRequest
 from .error import BatchError, UnavailableError, ClientError, RequestError, ServerError, ArgumentError
@@ -194,7 +194,7 @@ def _get_auth(self, ims_host, ims_endpoint_jwt,
         if not (tech_acct_id and api_key and client_secret and (private_key_data or private_key_file)):
             raise ArgumentError("Connector create: not all required auth parameters were supplied; please see docs")
         if private_key_data:
-            jwt = JWT(self.org_id, tech_acct_id, ims_host, api_key, six.StringIO(private_key_data))
+            jwt = JWT(self.org_id, tech_acct_id, ims_host, api_key, io.StringIO(private_key_data))
         else:
             with open(private_key_file, 'r') as private_key_stream:
                 jwt = JWT(self.org_id, tech_acct_id, ims_host, api_key, private_key_stream)
diff --git a/umapi_client/error.py b/umapi_client/error.py
@@ -18,8 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import six
-
 
 class UnavailableError(Exception):
     def __init__(self, attempts, seconds, result):
@@ -58,8 +56,6 @@ def __init__(self, causes, queued, sent, completed):
 
 class ArgumentError(ValueError):
     def __init__(self, message):
-        if six.PY2 and isinstance(message, unicode):
-            message = message.encode('utf8')
         ValueError.__init__(self, message)
 
 
diff --git a/umapi_client/functional.py b/umapi_client/functional.py
@@ -19,7 +19,6 @@
 # SOFTWARE.
 
 import re
-import six
 from enum import Enum
 
 from .api import Action, QuerySingle, QueryMultiple
@@ -173,9 +172,9 @@ def update(self, email=None, username=None, first_name=None, last_name=None, cou
         if email and username and email.lower() == username.lower():
             raise ArgumentError("Specify just email to set both email and username for a federated ID")
         updates = {}
-        for k, v in six.iteritems(dict(email=email, username=username,
-                                       firstname=first_name, lastname=last_name,
-                                       country=country)):
+        for k, v in dict(email=email, username=username,
+                         firstname=first_name, lastname=last_name,
+                         country=country).items():
             if v:
                 updates[k] = v
         return self.append(update=updates)
diff --git a/umapi_client/legacy.py b/umapi_client/legacy.py
@@ -31,7 +31,6 @@
 from time import time, sleep
 
 import requests
-import six
 
 from .api import Action as NewAction
 from .connection import Connection
@@ -69,13 +68,13 @@ def do(self, **kwargs):
         :return: the Action, so you can do Action(...).do(...).do(...)
         """
         # add "create" / "add" / "removeFrom" first
-        for k, v in list(six.iteritems(kwargs)):
+        for k, v in list(kwargs.items()):
             if k.startswith("create") or k.startswith("addAdobe") or k.startswith("removeFrom"):
                 self.commands.append({k: v})
                 del kwargs[k]
 
         # now do the other actions, in a canonical order (to avoid py2/py3 variations)
-        for k, v in sorted(six.iteritems(kwargs)):
+        for k, v in sorted(kwargs.items()):
             if k in ['add', 'remove']:
                 self.commands.append({k: {"product": v}})
             else:
