Make it run on 3.5 as well as 2.7.

* use six to smooth over unicode/string and module layout differences
* make sure the action construction is immune to implementation differences in hash order
* make sure the tests of action construction are immune to implementation differences in hash order

Author: adobeDan

adobe_umapi/__init__.py

@@ -1 +1 @@
-from api import UMAPI, Action
+from .api import UMAPI, Action

adobe_umapi/api.py

@@ -1,6 +1,7 @@
 import requests
 import json
-from error import UMAPIError, UMAPIRetryError, UMAPIRequestError, ActionFormatError
+import six
+from .error import UMAPIError, UMAPIRetryError, UMAPIRequestError, ActionFormatError
 
 
 class UMAPI(object):
@@ -17,7 +18,7 @@ def groups(self, org_id, page=0):
 
     def action(self, org_id, action):
         if not isinstance(action, Action):
-            if not isinstance(action, str) and hasattr(action, "__getitem__") or hasattr(action, "__iter__"):
+            if not isinstance(action, str) and (hasattr(action, "__getitem__") or hasattr(action, "__iter__")):
                 actions = [a.data for a in action]
             else:
                 raise ActionFormatError("action must be iterable, indexable or Action object")
@@ -51,19 +52,19 @@ def _call(self, method, call, params=None):
 class Action(object):
     def __init__(self, user_key, **kwargs):
         self.data = {"user": user_key, "do": []}    # empty actions upon creation
-        for k, v in kwargs.items():
+        for k, v in six.iteritems(kwargs):
             self.data[k] = v
 
     # do adds to any existing actions, so can you Action(...).do(...).do(...)
     def do(self, **kwargs):
         # add "create" / "add" / "removeFrom" first
-        for k, v in kwargs.items():
+        for k, v in list(six.iteritems(kwargs)):
             if k.startswith("create") or k.startswith("addAdobe") or k.startswith("removeFrom"):
                 self.data["do"].append({k: v})
                 del kwargs[k]
 
-        # now do the other actions
-        for k, v in kwargs.items():
+        # now do the other actions, in a canonical order (to avoid implementation variations)
+        for k, v in sorted(six.iteritems(kwargs)):
             if k in ['add', 'remove']:
                 self.data["do"].append({k: {"product": v}})
             else:

adobe_umapi/auth.py

@@ -1,9 +1,9 @@
 import time
-# noinspection PyPackageRequirements
+# noinspection PyPackageRequirements,PyUnresolvedReferences
 import jwt      # package name is PyJWT in setup
 import requests
 import datetime as dt
-from urllib import urlencode
+from six.moves.urllib.parse import urlencode
 
 
 class JWT(object):

adobe_umapi/helper.py

@@ -4,7 +4,7 @@
 from random import randint
 from sys import maxsize
 from time import time, sleep
-from error import UMAPIError, UMAPIRetryError, UMAPIRequestError
+from .error import UMAPIError, UMAPIRetryError, UMAPIRequestError
 
 # make the retry options module-global so they can be set by clients
 retry_max_attempts = 4

tests/test_actions.py

@@ -8,7 +8,7 @@
 
 
 # This method will be used by the mock to replace requests.get / requests.post
-def mocked_requests_call(target):
+def mocked_requests_call(target, **kwargs):
     class MockResponse:
         def __init__(self, status_code, data):
             self.status_code = status_code
@@ -87,7 +87,7 @@ def test_user_create_error(_):
 
 
 @mock.patch('adobe_umapi.api.requests.post', side_effect=mocked_requests_call)
-def test_user_create_success(_):
+def test_user_create_failure(_):
     """Test User Creation - FAILURE"""
     auth = mock.create_autospec(Auth)
 
@@ -128,23 +128,26 @@ def test_action_obj_create():
     action = Action(user_key="[email protected]").do(
         addAdobeID={"email": "[email protected]"}
     )
-    assert json.dumps(action.data) == '{"do": [{"addAdobeID": {"email": "[email protected]"}}], "user": "[email protected]"}'
+    assert json.dumps(action.data, sort_keys=True) ==\
+           '{"do": [{"addAdobeID": {"email": "[email protected]"}}], "user": "[email protected]"}'
 
 
 def test_action_obj_remove():
     """"Create a user removal action object"""
     action = Action(user_key="[email protected]").do(
         removeFromOrg={}
     )
-    assert json.dumps(action.data) == '{"do": [{"removeFromOrg": {}}], "user": "[email protected]"}'
+    assert json.dumps(action.data, sort_keys=True) ==\
+           '{"do": [{"removeFromOrg": {}}], "user": "[email protected]"}'
 
 
 def test_action_obj_update():
     """Create a user update action object"""
     action = Action(user_key="[email protected]").do(
         update={"firstname": "example", "lastname": "user"}
     )
-    assert json.dumps(action.data) == '{"do": [{"update": {"lastname": "user", "firstname": "example"}}], "user": "[email protected]"}'
+    assert json.dumps(action.data, sort_keys=True) ==\
+           '{"do": [{"update": {"firstname": "example", "lastname": "user"}}], "user": "[email protected]"}'
 
 
 def test_action_obj_multi():
@@ -154,12 +157,14 @@ def test_action_obj_multi():
         add=["product1", "product2"],
         remove=["product3"]
     )
-    assert json.dumps(action.data) == '{"do": [{"addAdobeID": {"email": "[email protected]"}}, {"add": {"product": ["product1", "product2"]}}, {"remove": {"product": ["product3"]}}], "user": "[email protected]"}'
+    assert json.dumps(action.data, sort_keys=True) ==\
+           '{"do": [{"addAdobeID": {"email": "[email protected]"}}, {"add": {"product": ["product1", "product2"]}}, {"remove": {"product": ["product3"]}}], "user": "[email protected]"}'
 
 
 def test_action_obj_requestid():
     """Include a request ID in action object"""
     action = Action(user_key="[email protected]", requestID="abc123").do(
         add=["product1"]
     )
-    assert json.dumps(action.data) == '{"do": [{"add": {"product": ["product1"]}}], "user": "[email protected]", "requestID": "abc123"}'
+    assert json.dumps(action.data, sort_keys=True) ==\
+           '{"do": [{"add": {"product": ["product1"]}}], "requestID": "abc123", "user": "[email protected]"}'