tox fixes

Author: allmightyspiff

SoftLayer/transports.py

@@ -568,11 +568,16 @@ def _format_object_mask(objectmask):
         objectmask = "mask[%s]" % objectmask
     return objectmask
 
+
 class ComplexEncoder(json.JSONEncoder):
-    def default(self, obj):
+    """ComplexEncoder helps jsonencoder deal with byte strings"""
+
+    def default(self, o):
+        """Encodes o as JSON"""
+
         # Base64 encode bytes type objects.
-        if isinstance(obj, bytes):
-            base64_bytes = base64.b64encode(obj)
+        if isinstance(o, bytes):
+            base64_bytes = base64.b64encode(o)
             return base64_bytes.decode("utf-8")
         # Let the base class default method raise the TypeError
-        return json.JSONEncoder.default(self, obj)
+        return json.JSONEncoder.default(self, o)

tests/transport_tests.py

@@ -528,7 +528,6 @@ def test_with_args(self, request):
             proxies=None,
             timeout=None)
 
-
     @mock.patch('SoftLayer.transports.requests.Session.request')
     def test_with_args_bytes(self, request):
         request().text = '{}'
@@ -702,7 +701,7 @@ def test_print_reproduceable(self):
 
     def test_complex_encoder_bytes(self):
         to_encode = {
-            'test' : ['array', 0, 1, False],
+            'test': ['array', 0, 1, False],
             'bytes': b'ASDASDASD'
         }
         result = json.dumps(to_encode, cls=transports.ComplexEncoder)