Merge branch 'master' of https://github.com/softlayer/softlayer-python into issue1324

Author: caberos

SoftLayer/CLI/exceptions.py

@@ -12,7 +12,7 @@ class CLIHalt(SystemExit):
     """Smoothly halt the execution of the command. No error."""
 
     def __init__(self, code=0, *args):
-        super(CLIHalt, self).__init__(*args)
+        super().__init__(*args)
         self.code = code
 
     def __str__(self):
@@ -26,13 +26,13 @@ class CLIAbort(CLIHalt):
     """Halt the execution of the command. Gives an exit code of 2."""
 
     def __init__(self, msg, *args):
-        super(CLIAbort, self).__init__(code=2, *args)
+        super().__init__(code=2, *args)
         self.message = msg
 
 
 class ArgumentError(CLIAbort):
     """Halt the execution of the command because of invalid arguments."""
 
     def __init__(self, msg, *args):
-        super(ArgumentError, self).__init__(msg, *args)
+        super().__init__(msg, *args)
         self.message = "Argument Error: %s" % msg

SoftLayer/CLI/formatting.py

@@ -235,7 +235,7 @@ class SequentialOutput(list):
 
     def __init__(self, separator=os.linesep, *args, **kwargs):
         self.separator = separator
-        super(SequentialOutput, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def to_python(self):
         """returns itself, since it itself is a list."""
@@ -252,7 +252,7 @@ def default(self, obj):
         """Encode object if it implements to_python()."""
         if hasattr(obj, 'to_python'):
             return obj.to_python()
-        return super(CLIJSONEncoder, self).default(obj)
+        return super().default(obj)
 
 
 class Table(object):

SoftLayer/CLI/hardware/dns.py

@@ -60,5 +60,6 @@ def cli(env, identifier, a_record, aaaa_record, ptr, ttl):
             # done this way to stay within 80 character lines
             ipv6 = instance['primaryNetworkComponent']['primaryVersion6IpAddressRecord']['ipAddress']
             dns.sync_host_record(zone_id, instance['hostname'], ipv6, 'aaaa', ttl)
-        except KeyError:
-            raise exceptions.CLIAbort("%s does not have an ipv6 address" % instance['fullyQualifiedDomainName'])
+        except KeyError as ex:
+            message = "{} does not have an ipv6 address".format(instance['fullyQualifiedDomainName'])
+            raise exceptions.CLIAbort(message) from ex

SoftLayer/CLI/metadata.py

@@ -54,11 +54,10 @@ def cli(env, prop):
 
         meta_prop = META_MAPPING.get(prop) or prop
         env.fout(SoftLayer.MetadataManager().get(meta_prop))
-    except SoftLayer.TransportError:
-        raise exceptions.CLIAbort(
-            'Cannot connect to the backend service address. Make sure '
-            'this command is being ran from a device on the backend '
-            'network.')
+    except SoftLayer.TransportError as ex:
+        message = 'Cannot connect to the backend service address. Make sure '\
+                  'this command is being ran from a device on the backend network.'
+        raise exceptions.CLIAbort(message) from ex
 
 
 def get_network():

SoftLayer/CLI/report/bandwidth.py

@@ -19,9 +19,9 @@ def _validate_datetime(ctx, param, value):
 
     try:
         return datetime.datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
-    except (ValueError, TypeError):
-        raise click.BadParameter(
-            "not in the format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'")
+    except (ValueError, TypeError) as ex:
+        message = "not in the format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'"
+        raise click.BadParameter(message) from ex
 
 
 def _get_pooled_bandwidth(env, start, end):

SoftLayer/CLI/virt/dns.py

@@ -60,5 +60,6 @@ def cli(env, identifier, a_record, aaaa_record, ptr, ttl):
             # done this way to stay within 80 character lines
             ipv6 = instance['primaryNetworkComponent']['primaryVersion6IpAddressRecord']['ipAddress']
             dns.sync_host_record(zone_id, instance['hostname'], ipv6, 'aaaa', ttl)
-        except KeyError:
-            raise exceptions.CLIAbort("%s does not have an ipv6 address" % instance['fullyQualifiedDomainName'])
+        except KeyError as ex:
+            message = "{} does not have an ipv6 address".format(instance['fullyQualifiedDomainName'])
+            raise exceptions.CLIAbort(message) from ex

SoftLayer/fixtures/SoftLayer_Account.py

@@ -1,6 +1,3 @@
-# -*- coding: UTF-8 -*-
-
-# # pylint: disable=bad-continuation
 getPrivateBlockDeviceTemplateGroups = [{
     'accountId': 1234,
     'blockDevices': [],

SoftLayer/managers/ordering.py

@@ -12,10 +12,7 @@
 from SoftLayer import exceptions
 
 
-CATEGORY_MASK = '''id,
-                   isRequired,
-                   itemCategory[id, name, categoryCode]
-                '''
+CATEGORY_MASK = '''id, isRequired, itemCategory[id, name, categoryCode]'''
 
 ITEM_MASK = '''id, keyName, description, itemCategory, categories, prices'''
 
@@ -359,10 +356,10 @@ def get_price_id_list(self, package_keyname, item_keynames, core=None):
                 # keyName with the current item we are searching for
                 matching_item = [i for i in items
                                  if i['keyName'] == item_keyname][0]
-            except IndexError:
-                raise exceptions.SoftLayerError(
-                    "Item {} does not exist for package {}".format(item_keyname,
-                                                                   package_keyname))
+            except IndexError as ex:
+                message = "Item {} does not exist for package {}".format(item_keyname,
+                                                                         package_keyname)
+                raise exceptions.SoftLayerError(message) from ex
 
             # we want to get the price ID that has no location attached to it,
             # because that is the most generic price. verifyOrder/placeOrder

SoftLayer/managers/storage_utils.py

@@ -533,10 +533,9 @@ def prepare_volume_order_object(manager, storage_type, location, size,
     # Find the ID for the requested location
     try:
         location_id = get_location_id(manager, location)
-    except ValueError:
-        raise exceptions.SoftLayerError(
-            "Invalid datacenter name specified. "
-            "Please provide the lower case short name (e.g.: dal09)")
+    except ValueError as ex:
+        message = "Invalid datacenter name specified. Please provide the lower case short name (e.g.: dal09)"
+        raise exceptions.SoftLayerError(message) from ex
 
     # Determine the category code to use for the order (and product package)
     order_type_is_saas, order_category_code = _get_order_type_and_category(
@@ -676,10 +675,9 @@ def prepare_replicant_order_object(manager, snapshot_schedule, location,
     # Find the ID for the requested location
     try:
         location_id = get_location_id(manager, location)
-    except ValueError:
-        raise exceptions.SoftLayerError(
-            "Invalid datacenter name specified. "
-            "Please provide the lower case short name (e.g.: dal09)")
+    except ValueError as ex:
+        message = "Invalid datacenter name specified. Please provide the lower case short name (e.g.: dal09)"
+        raise exceptions.SoftLayerError(message) from ex
 
     # Get sizes and properties needed for the order
     volume_size = int(volume['capacityGb'])

SoftLayer/managers/vs_capacity.py

@@ -143,8 +143,8 @@ def create_guest(self, capacity_id, test, guest_object):
         try:
             capacity_flavor = capacity['instances'][0]['billingItem']['item']['keyName']
             flavor = _flavor_string(capacity_flavor, guest_object['primary_disk'])
-        except KeyError:
-            raise SoftLayerError("Unable to find capacity Flavor.")
+        except KeyError as ex:
+            raise SoftLayerError("Unable to find capacity Flavor.") from ex
 
         guest_object['flavor'] = flavor
         guest_object['datacenter'] = capacity['backendRouter']['datacenter']['name']