fixing up some tox complaints

Author: allmightyspiff

SoftLayer/CLI/__init__.py

@@ -6,7 +6,5 @@
     :license: MIT, see LICENSE for more details.
 """
 # pylint: disable=w0401, invalid-name
-import logging
 
 from SoftLayer.CLI.helpers import *  # NOQA
-

SoftLayer/CLI/core.py

@@ -151,13 +151,13 @@ def output_diagnostics(env, verbose=0, **kwargs):
 
     if verbose > 1:
         for call in env.client.transport.get_last_calls():
-            call_table = formatting.Table(['','{}::{}'.format(call.service, call.method)])
+            call_table = formatting.Table(['', '{}::{}'.format(call.service, call.method)])
             nice_mask = ''
             if call.mask is not None:
                 nice_mask = call.mask
 
             call_table.add_row(['id', call.identifier])
-            call_table.add_row(['mask', call.mask])
+            call_table.add_row(['mask', nice_mask])
             call_table.add_row(['filter', call.filter])
             call_table.add_row(['limit', call.limit])
             call_table.add_row(['offset', call.offset])

SoftLayer/transports.py

@@ -120,9 +120,6 @@ def __init__(self):
         #: Exception any exceptions that got caught
         self.exception = None
 
-        #: String Url parameters used in the Rest transport
-        self.params = None
-
 
 class SoftLayerListResult(list):
     """A SoftLayer API list result."""
@@ -168,9 +165,12 @@ def __call__(self, request):
             headers[header_name] = {'id': request.identifier}
 
         if request.mask is not None:
-            request.mask = _format_object_mask(request.mask)
-            headers.update(_format_object_mask_xmlrpc(request.mask, request.service))
-
+            if isinstance(request.mask, dict):
+                mheader = '%sObjectMask' % request.service
+            else:
+                mheader = 'SoftLayer_ObjectMask'
+                request.mask = _format_object_mask(request.mask)
+            headers.update({mheader: {'mask': request.mask}})
 
         if request.filter is not None:
             headers['%sObjectFilter' % request.service] = request.filter
@@ -187,15 +187,14 @@ def __call__(self, request):
 
         request.url = '/'.join([self.endpoint_url, request.service])
         request.payload = utils.xmlrpc_client.dumps(tuple(largs),
-                                            methodname=request.method,
-                                            allow_none=True)
+                                                    methodname=request.method,
+                                                    allow_none=True)
 
         # Prefer the request setting, if it's not None
         verify = request.verify
         if verify is None:
             request.verify = self.verify
 
-
         try:
             resp = self.client.request('POST', request.url,
                                        data=request.payload,
@@ -259,17 +258,17 @@ def print_reproduceable(self, request):
 verify = $verify
 cert = $cert
 proxy = $proxy
-response = client.request('POST', url, data=payload, headers=transport_headers, timeout=timeout, 
+response = client.request('POST', url, data=payload, headers=transport_headers, timeout=timeout,
                verify=verify, cert=cert, proxies=proxy)
 xml = ElementTree.fromstring(response.content)
 ElementTree.dump(xml)
 ==========================''')
 
-
         safe_payload = re.sub(r'<string>[a-z0-9]{64}</string>', r'<string>API_KEY_GOES_HERE</string>', request.payload)
         safe_payload = re.sub(r'(\s+)', r' ', safe_payload)
-        substitutions = dict(url=request.url, payload=safe_payload, transport_headers=request.transport_headers, 
-                             timeout=self.timeout, verify=request.verify, cert=request.cert, proxy=_proxies_dict(self.proxy))
+        substitutions = dict(url=request.url, payload=safe_payload, transport_headers=request.transport_headers,
+                             timeout=self.timeout, verify=request.verify, cert=request.cert,
+                             proxy=_proxies_dict(self.proxy))
         return output.substitute(substitutions)
 
 
@@ -340,7 +339,6 @@ def __call__(self, request):
             method = 'POST'
             body['parameters'] = request.args
 
-
         if body:
             request.payload = json.dumps(body)
 
@@ -385,7 +383,6 @@ def __call__(self, request):
             request.url = ex.response.url
             raise exceptions.SoftLayerAPIError(ex.response.status_code, message)
         except requests.RequestException as ex:
-            request.url = ex.response.url
             raise exceptions.TransportError(0, str(ex))
 
     def print_reproduceable(self, request):
@@ -442,17 +439,24 @@ def __call__(self, call):
         return call.result
 
     def pre_transport_log(self, call):
-        LOGGER.warning("Calling: {}::{}(id={})".format(call.service, call.method, call.identifier))
+        """Prints a warning before calling the API """
+        output = "Calling: {}::{}(id={})".format(call.service, call.method, call.identifier)
+        LOGGER.warning(output)
 
     def post_transport_log(self, call):
-        LOGGER.debug("Returned Data: \n{}".format(call.result))
+        """Prints the result "Returned Data: \n%s" % (call.result)of an API call"""
+        output = "Returned Data: \n{}".format(call.result)
+        LOGGER.debug(output)
 
     def get_last_calls(self):
+        """Returns all API calls for a session"""
         return self.requests
 
     def print_reproduceable(self, call):
+        """Prints a reproduceable debugging output"""
         return self.transport.print_reproduceable(call)
 
+
 class TimingTransport(object):
     """Transport that records API call timings."""
 
@@ -480,6 +484,10 @@ def get_last_calls(self):
         self.last_calls = []
         return last_calls
 
+    def print_reproduceable(self, call):
+        """Not Implemented"""
+        return "Not Implemented"
+
 
 class FixtureTransport(object):
     """Implements a transport which returns fixtures."""
@@ -495,6 +503,10 @@ def __call__(self, call):
         except AttributeError:
             raise NotImplementedError('%s::%s fixture is not implemented' % (call.service, call.method))
 
+    def print_reproduceable(self, call):
+        """Not Implemented"""
+        return "Not Implemented"
+
 
 def _proxies_dict(proxy):
     """Makes a proxy dict appropriate to pass to requests."""
@@ -503,21 +515,6 @@ def _proxies_dict(proxy):
     return {'http': proxy, 'https': proxy}
 
 
-def _format_object_mask_xmlrpc(objectmask, service):
-    """Format new and old style object masks into proper headers.
-
-    :param objectmask: a string- or dict-based object mask
-    :param service: a SoftLayer API service name
-
-    """
-    if isinstance(objectmask, dict):
-        mheader = '%sObjectMask' % service
-    else:
-        mheader = 'SoftLayer_ObjectMask'
-
-    return {mheader: {'mask': objectmask}}
-
-
 def _format_object_mask(objectmask):
     """Format the new style object mask.
 
@@ -528,7 +525,7 @@ def _format_object_mask(objectmask):
 
     """
     objectmask = objectmask.strip()
-    objectmask = re.sub(r'(\s+)', r' ', objectmask)
+
     if (not objectmask.startswith('mask') and
             not objectmask.startswith('[')):
         objectmask = "mask[%s]" % objectmask