Merge pull request #1173 from camporter/fix_pylint_2.4_issues

Fix issues introduced with pylint 2.4.0

Author: allmightyspiff

SoftLayer/CLI/core.py

@@ -9,6 +9,7 @@
 import os
 import sys
 import time
+import traceback
 import types
 
 import click
@@ -196,7 +197,6 @@ def main(reraise_exceptions=False, **kwargs):
         if reraise_exceptions:
             raise
 
-        import traceback
         print("An unexpected error has occured:")
         print(str(traceback.format_exc()))
         print("Feel free to report this error as it is likely a bug:")

SoftLayer/CLI/deprecated.py

@@ -11,4 +11,4 @@ def main():
     """Main function for the deprecated 'sl' command."""
     print("ERROR: Use the 'slcli' command instead.", file=sys.stderr)
     print("> slcli %s" % ' '.join(sys.argv[1:]), file=sys.stderr)
-    exit(-1)
+    sys.exit(-1)

SoftLayer/CLI/firewall/edit.py

@@ -154,11 +154,9 @@ def cli(env, identifier):
             try:
                 rules = parse_rules(edited_rules)
                 if firewall_type == 'vlan':
-                    rules = mgr.edit_dedicated_fwl_rules(firewall_id,
-                                                         rules)
+                    mgr.edit_dedicated_fwl_rules(firewall_id, rules)
                 else:
-                    rules = mgr.edit_standard_fwl_rules(firewall_id,
-                                                        rules)
+                    mgr.edit_standard_fwl_rules(firewall_id, rules)
                 break
             except (SoftLayer.SoftLayerError, ValueError) as error:
                 env.out("Unexpected error({%s})" % (error))
@@ -169,10 +167,8 @@ def cli(env, identifier):
                     if formatting.confirm("Would you like to submit the "
                                           "rules. Continue?"):
                         continue
-                    else:
-                        raise exceptions.CLIAbort('Aborted.')
-                else:
                     raise exceptions.CLIAbort('Aborted.')
-                env.fout('Firewall updated!')
+                raise exceptions.CLIAbort('Aborted.')
+        env.fout('Firewall updated!')
     else:
         raise exceptions.CLIAbort('Aborted.')

SoftLayer/CLI/loadbal/pools.py

@@ -177,7 +177,7 @@ def l7pool_add(env, identifier, **args):
         'protocol': args.get('protocol')
     }
 
-    pool_members = [member for member in args.get('server')]
+    pool_members = list(args.get('server'))
 
     pool_health = {
         'interval': args.get('healthinterval'),

SoftLayer/CLI/user/create.py

@@ -91,7 +91,7 @@ def cli(env, username, email, password, from_user, template, api_key):
 def generate_password():
     """Returns a 23 character random string, with 3 special characters at the end"""
     if sys.version_info > (3, 6):
-        import secrets  # pylint: disable=import-error
+        import secrets  # pylint: disable=import-error,import-outside-toplevel
         alphabet = string.ascii_letters + string.digits
         password = ''.join(secrets.choice(alphabet) for i in range(20))
         special = ''.join(secrets.choice(string.punctuation) for i in range(3))

SoftLayer/CLI/virt/create.py

@@ -130,11 +130,11 @@ def _parse_create_args(client, args):
 
     if args.get('public_security_group'):
         pub_groups = args.get('public_security_group')
-        data['public_security_groups'] = [group for group in pub_groups]
+        data['public_security_groups'] = list(pub_groups)
 
     if args.get('private_security_group'):
         priv_groups = args.get('private_security_group')
-        data['private_security_groups'] = [group for group in priv_groups]
+        data['private_security_groups'] = list(priv_groups)
 
     if args.get('tag', False):
         data['tags'] = ','.join(args['tag'])

SoftLayer/managers/firewall.py

@@ -282,7 +282,8 @@ def edit_standard_fwl_rules(self, firewall_id, rules):
         """Edit the rules for standard firewall.
 
         :param integer firewall_id: the instance ID of the standard firewall
-        :param dict rules: the rules to be pushed on the firewall
+        :param list rules: the rules to be pushed on the firewall as defined by
+                           SoftLayer_Network_Firewall_Update_Request_Rule
         """
 
         rule_svc = self.client['Network_Firewall_Update_Request']

SoftLayer/managers/hardware.py

@@ -281,7 +281,7 @@ def reload(self, hardware_id, post_uri=None, ssh_keys=None):
             config['customProvisionScriptUri'] = post_uri
 
         if ssh_keys:
-            config['sshKeyIds'] = [key_id for key_id in ssh_keys]
+            config['sshKeyIds'] = list(ssh_keys)
 
         return self.hardware.reloadOperatingSystem('FORCE', config,
                                                    id=hardware_id)

SoftLayer/managers/user.py

@@ -132,8 +132,7 @@ def permissions_from_user(self, user_id, from_user_id):
             # If permission does not exist for from_user_id add it to the list to be removed
             if _keyname_search(from_permissions, permission['keyName']):
                 continue
-            else:
-                remove_permissions.append({'keyName': permission['keyName']})
+            remove_permissions.append({'keyName': permission['keyName']})
 
         self.remove_permissions(user_id, remove_permissions)
         return True

SoftLayer/managers/vs.py

@@ -303,7 +303,7 @@ def reload_instance(self, instance_id,
             config['customProvisionScriptUri'] = post_uri
 
         if ssh_keys:
-            config['sshKeyIds'] = [key_id for key_id in ssh_keys]
+            config['sshKeyIds'] = list(ssh_keys)
 
         if image_id:
             config['imageTemplateId'] = image_id