Merge pull request #1510 from FernandoOjeda/ft/fix_analysis_issues

Fix Tox-analysis issues.

Author: allmightyspiff

SoftLayer/CLI/block/count.py

@@ -37,6 +37,6 @@ def cli(env, sortby, datacenter):
 
     table = formatting.KeyValueTable(DEFAULT_COLUMNS)
     table.sortby = sortby
-    for datacenter_name in datacenters:
-        table.add_row([datacenter_name, datacenters[datacenter_name]])
+    for key, value in datacenters.items():
+        table.add_row([key, value])
     env.fout(table)

SoftLayer/CLI/core.py

@@ -54,17 +54,17 @@ def list_commands(self, ctx):
 
         return sorted(env.list_commands(*self.path))
 
-    def get_command(self, ctx, name):
+    def get_command(self, ctx, cmd_name):
         """Get command for click."""
         env = ctx.ensure_object(environment.Environment)
         env.load()
 
         # Do alias lookup (only available for root commands)
         if len(self.path) == 0:
-            name = env.resolve_alias(name)
+            cmd_name = env.resolve_alias(cmd_name)
 
         new_path = list(self.path)
-        new_path.append(name)
+        new_path.append(cmd_name)
         module = env.get_command(*new_path)
         if isinstance(module, types.ModuleType):
             return CommandLoader(*new_path, help=module.__doc__ or '')

SoftLayer/CLI/file/count.py

@@ -36,6 +36,6 @@ def cli(env, sortby, datacenter):
 
     table = formatting.KeyValueTable(DEFAULT_COLUMNS)
     table.sortby = sortby
-    for datacenter_name in datacenters:
-        table.add_row([datacenter_name, datacenters[datacenter_name]])
+    for key, value in datacenters.items():
+        table.add_row([key, value])
     env.fout(table)

SoftLayer/CLI/formatting.py

@@ -248,11 +248,11 @@ def __str__(self):
 class CLIJSONEncoder(json.JSONEncoder):
     """A JSON encoder which is able to use a .to_python() method on objects."""
 
-    def default(self, obj):
+    def default(self, o):
         """Encode object if it implements to_python()."""
-        if hasattr(obj, 'to_python'):
-            return obj.to_python()
-        return super().default(obj)
+        if hasattr(o, 'to_python'):
+            return o.to_python()
+        return super().default(o)
 
 
 class Table(object):

SoftLayer/CLI/loadbal/detail.py

@@ -83,8 +83,8 @@ def lbaas_table(this_lb):
 
     # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_Member/
     member_col = ['UUID', 'Address', 'Weight', 'Modify', 'Active']
-    for uuid in pools:
-        member_col.append(pools[uuid])
+    for uuid in pools.values():
+        member_col.append(uuid)
     member_table = formatting.Table(member_col)
     for member in this_lb.get('members', []):
         row = [

SoftLayer/CLI/loadbal/pools.py

@@ -114,9 +114,9 @@ def edit(env, identifier, listener, **args):
         'sslcert': 'tlsCertificateId'
     }
 
-    for arg in args:
-        if args[arg]:
-            new_listener[arg_to_option[arg]] = args[arg]
+    for key, value in args.items():
+        if value:
+            new_listener[arg_to_option[key]] = value
 
     try:
         mgr.add_lb_listener(uuid, new_listener)

SoftLayer/CLI/ssl/add.py

@@ -28,15 +28,19 @@ def cli(env, crt, csr, icc, key, notes):
         'certificateSigningRequest': '',
         'notes': notes,
     }
-    template['certificate'] = open(crt).read()
-    template['privateKey'] = open(key).read()
-    if csr:
-        body = open(csr).read()
-        template['certificateSigningRequest'] = body
+    with open(crt) as file_crt:
+        template['certificate'] = file_crt.read()
+    with open(key) as file_key:
+        template['privateKey'] = file_key.read()
+    with open(csr) as file_csr:
+        if csr:
+            body = file_csr.read()
+            template['certificateSigningRequest'] = body
 
-    if icc:
-        body = open(icc).read()
-        template['intermediateCertificate'] = body
+    with open(icc) as file_icc:
+        if icc:
+            body = file_icc.read()
+            template['intermediateCertificate'] = body
 
     manager = SoftLayer.SSLManager(env.client)
     manager.add_certificate(template)

SoftLayer/CLI/ssl/edit.py

@@ -24,14 +24,18 @@
 def cli(env, identifier, crt, csr, icc, key, notes):
     """Edit SSL certificate."""
     template = {'id': identifier}
-    if crt:
-        template['certificate'] = open(crt).read()
-    if key:
-        template['privateKey'] = open(key).read()
-    if csr:
-        template['certificateSigningRequest'] = open(csr).read()
-    if icc:
-        template['intermediateCertificate'] = open(icc).read()
+    with open(crt) as file_crt:
+        if crt:
+            template['certificate'] = file_crt.read()
+    with open(key) as file_key:
+        if key:
+            template['privateKey'] = file_key.read()
+    with open(csr) as file_csr:
+        if csr:
+            template['certificateSigningRequest'] = file_csr.read()
+    with open(icc) as file_icc:
+        if icc:
+            template['intermediateCertificate'] = file_icc.read()
     if notes:
         template['notes'] = notes
 

SoftLayer/CLI/template.py

@@ -24,11 +24,11 @@ def __call__(self, ctx, param, value):
         if value is None:
             return
 
-        config = configparser.ConfigParser()
-        ini_str = '[settings]\n' + open(
-            os.path.expanduser(value), 'r').read()
-        ini_fp = io.StringIO(ini_str)
-        config.read_file(ini_fp)
+        with open(os.path.expanduser(value), 'r') as file_handle:
+            config = configparser.ConfigParser()
+            ini_str = '[settings]\n' + file_handle.read()
+            ini_fp = io.StringIO(ini_str)
+            config.read_file(ini_fp)
 
         # Merge template options with the options passed in
         args = {}

SoftLayer/CLI/virt/bandwidth.py

@@ -71,15 +71,15 @@ def create_bandwidth_table(data, summary_period, title="Bandwidth Report"):
         {'keyName': 'privateOut_net_octet', 'sum': 0.0, 'max': 0, 'name': 'Pri Out'},
     ]
 
-    for point in formatted_data:
-        new_row = [point]
+    for key, value in formatted_data.items():
+        new_row = [key]
         for bw_type in bw_totals:
-            counter = formatted_data[point].get(bw_type['keyName'], 0)
+            counter = value.get(bw_type['keyName'], 0)
             new_row.append(mb_to_gb(counter))
             bw_type['sum'] = bw_type['sum'] + counter
             if counter > bw_type['max']:
                 bw_type['max'] = counter
-                bw_type['maxDate'] = point
+                bw_type['maxDate'] = key
         table.add_row(new_row)
 
     for bw_type in bw_totals: