This fixes json decoding in python 3 (#148)

Author: caphrim007

icontrol/session.py

@@ -71,6 +71,8 @@
 import functools
 import logging
 import requests
+import urllib3
+
 
 try:
     import json
@@ -388,7 +390,14 @@ def __init__(self, username, password, **kwargs):
 
         if kwargs:
             raise TypeError('Unexpected **kwargs: %r' % kwargs)
-        requests.packages.urllib3.disable_warnings()
+
+        try:
+            requests.packages.urllib3.disable_warnings()
+        except AttributeError:
+            try:
+                urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+            except Exception:
+                pass
 
         # Compose with a Session obj
         self.session = requests.Session()
@@ -611,7 +620,7 @@ def debug_prepared_request(request):
         result = result + " -H '{0}: {1}'".format(k, v)
     if any(v == 'application/json' for k, v in iteritems(request.headers)):
         if request.body:
-            kwargs = json.loads(request.body)
+            kwargs = json.loads(request.body.decode('utf-8'))
             result = result + " -d '" + json.dumps(kwargs, sort_keys=True) + "'"
     return result
 

icontrol/test/unit/test_session.py

@@ -36,6 +36,20 @@ def iCRS():
     return fake_iCRS
 
 
+@pytest.fixture()
+def iCRSBytes():
+    fake_iCRS = session.iControlRESTSession('admin', 'admin')
+    fake_iCRS.session = mock.MagicMock()
+    req = requests.PreparedRequest()
+    req.prepare(method='post', url='https://0.0.0.0/mgmt/tm/root/RESTiface/')
+    req.body = b'{"foo": "bar"}'
+    fake_iCRS.session.prepare_request.return_value = req
+    mock_response = mock.MagicMock()
+    mock_response.status_code = 200
+    fake_iCRS.session.send.return_value = mock_response
+    return fake_iCRS
+
+
 @pytest.fixture()
 def uparts():
     parts_dict = {'base_uri': 'https://0.0.0.0/mgmt/tm/root/RESTiface/',
@@ -472,6 +486,14 @@ def test_wrapped_post_success_with_json_and_data(iCRS, uparts):
     assert iCRS.session.prepare_request.call_args[0][0].json == '{"a": 1}'
 
 
+def test_wrapped_post_success_with_json_and_data_bytestring(iCRSBytes, uparts):
+    iCRSBytes.post(uparts['base_uri'], partition='AFN', name='AIN', data={'a': 1}, json='{"a": 1}', uri_as_parts=True)
+    assert isinstance(iCRSBytes.session.prepare_request.call_args[0][0], requests.Request)
+    assert iCRSBytes.session.prepare_request.call_args[0][0].url == 'https://0.0.0.0/mgmt/tm/root/RESTiface/~AFN~AIN'
+    assert iCRSBytes.session.prepare_request.call_args[0][0].data == {'a': 1}
+    assert iCRSBytes.session.prepare_request.call_args[0][0].json == '{"a": 1}'
+
+
 def test_wrapped_put_success(iCRS, uparts):
     iCRS.put(uparts['base_uri'], partition='AFN', name='AIN', uri_as_parts=True)
     assert isinstance(iCRS.session.prepare_request.call_args[0][0], requests.Request)

setup.py

@@ -28,7 +28,7 @@
       author_email='f5-icontrol-rest-python@f5.com',
       url='https://github.com/F5Networks/f5-icontrol-rest-python',
       keywords=['F5', 'icontrol', 'rest', 'api', 'bigip'],
-      install_requires=['requests >= 2.5.0, < 3'],
+      install_requires=['requests >= 2.5.0, < 3', 'urllib3'],
       py_modules=[
           'icontrol.session',
       ],