Fix linting errors; fix some real bugs (#5111)

* Fix linting errors.

* Fix bugs.

* Another linter error ignored.

* More fixes.

* Ignore sanity errors with older versions.

ci_complete

* Forgot to commit more changes.

plugins/modules/cloud/memset/memset_dns_reload.py

@@ -112,7 +112,7 @@ def poll_reload_status(api_key=None, job_id=None, payload=None):
         memset_api = response.json()
         msg = None
 
-    return(memset_api, msg, stderr)
+    return memset_api, msg, stderr
 
 
 def reload_dns(args=None):
@@ -134,7 +134,7 @@ def reload_dns(args=None):
         retvals['failed'] = has_failed
         retvals['memset_api'] = response.json()
         retvals['msg'] = msg
-        return(retvals)
+        return retvals
 
     # set changed to true if the reload request was accepted.
     has_changed = True
@@ -154,7 +154,7 @@ def reload_dns(args=None):
         if val is not None:
             retvals[val] = eval(val)
 
-    return(retvals)
+    return retvals
 
 
 def main():

plugins/modules/cloud/memset/memset_memstore_info.py

@@ -128,7 +128,7 @@ def get_facts(args=None):
         retvals['failed'] = has_failed
         retvals['msg'] = msg
         retvals['stderr'] = "API returned an error: {0}" . format(response.status_code)
-        return(retvals)
+        return retvals
 
     # we don't want to return the same thing twice
     msg = None
@@ -140,7 +140,7 @@ def get_facts(args=None):
         if val is not None:
             retvals[val] = eval(val)
 
-    return(retvals)
+    return retvals
 
 
 def main():

plugins/modules/cloud/memset/memset_server_info.py

@@ -253,7 +253,7 @@ def get_facts(args=None):
         retvals['failed'] = has_failed
         retvals['msg'] = msg
         retvals['stderr'] = "API returned an error: {0}" . format(response.status_code)
-        return(retvals)
+        return retvals
 
     # we don't want to return the same thing twice
     msg = None
@@ -265,7 +265,7 @@ def get_facts(args=None):
         if val is not None:
             retvals[val] = eval(val)
 
-    return(retvals)
+    return retvals
 
 
 def main():

plugins/modules/cloud/memset/memset_zone.py

@@ -140,7 +140,7 @@ def check(args=None):
     retvals['changed'] = has_changed
     retvals['failed'] = has_failed
 
-    return(retvals)
+    return retvals
 
 
 def create_zone(args=None, zone_exists=None, payload=None):
@@ -186,7 +186,7 @@ def create_zone(args=None, zone_exists=None, payload=None):
         _has_failed, _msg, response = memset_api_call(api_key=args['api_key'], api_method=api_method, payload=payload)
         memset_api = response.json()
 
-    return(has_failed, has_changed, memset_api, msg)
+    return has_failed, has_changed, memset_api, msg
 
 
 def delete_zone(args=None, zone_exists=None, payload=None):
@@ -234,7 +234,7 @@ def delete_zone(args=None, zone_exists=None, payload=None):
     else:
         has_failed, has_changed = False, False
 
-    return(has_failed, has_changed, memset_api, msg)
+    return has_failed, has_changed, memset_api, msg
 
 
 def create_or_delete(args=None):
@@ -256,7 +256,7 @@ def create_or_delete(args=None):
         retvals['failed'] = _has_failed
         retvals['msg'] = _msg
 
-        return(retvals)
+        return retvals
 
     zone_exists, _msg, counter, _zone_id = get_zone_id(zone_name=args['name'], current_zones=response.json())
 
@@ -272,7 +272,7 @@ def create_or_delete(args=None):
         if val is not None:
             retvals[val] = eval(val)
 
-    return(retvals)
+    return retvals
 
 
 def main():

plugins/modules/cloud/memset/memset_zone_domain.py

@@ -111,7 +111,7 @@ def check(args=None):
     retvals['changed'] = has_changed
     retvals['failed'] = has_failed
 
-    return(retvals)
+    return retvals
 
 
 def create_zone_domain(args=None, zone_exists=None, zone_id=None, payload=None):
@@ -139,7 +139,7 @@ def create_zone_domain(args=None, zone_exists=None, zone_id=None, payload=None):
         if not has_failed:
             has_changed = True
 
-    return(has_failed, has_changed, msg)
+    return has_failed, has_changed, msg
 
 
 def delete_zone_domain(args=None, payload=None):
@@ -166,7 +166,7 @@ def delete_zone_domain(args=None, payload=None):
             # unset msg as we don't want to return unnecessary info to the user.
             msg = None
 
-    return(has_failed, has_changed, memset_api, msg)
+    return has_failed, has_changed, memset_api, msg
 
 
 def create_or_delete_domain(args=None):
@@ -189,7 +189,7 @@ def create_or_delete_domain(args=None):
         retvals['failed'] = has_failed
         retvals['msg'] = msg
         retvals['stderr'] = "API returned an error: {0}" . format(response.status_code)
-        return(retvals)
+        return retvals
 
     zone_exists, msg, counter, zone_id = get_zone_id(zone_name=args['zone'], current_zones=response.json())
 
@@ -204,7 +204,7 @@ def create_or_delete_domain(args=None):
 
         retvals['failed'] = has_failed
         retvals['msg'] = stderr
-        return(retvals)
+        return retvals
 
     if args['state'] == 'present':
         has_failed, has_changed, msg = create_zone_domain(args=args, zone_exists=zone_exists, zone_id=zone_id, payload=payload)
@@ -218,7 +218,7 @@ def create_or_delete_domain(args=None):
         if val is not None:
             retvals[val] = eval(val)
 
-    return(retvals)
+    return retvals
 
 
 def main():

plugins/modules/cloud/memset/memset_zone_record.py

@@ -222,7 +222,7 @@ def create_zone_record(args=None, zone_id=None, records=None, payload=None):
                 # nothing to do; record is already correct so we populate
                 # the return var with the existing record's details.
                 memset_api = zone_record
-                return(has_changed, has_failed, memset_api, msg)
+                return has_changed, has_failed, memset_api, msg
             else:
                 # merge dicts ensuring we change any updated values
                 payload = zone_record.copy()
@@ -232,7 +232,7 @@ def create_zone_record(args=None, zone_id=None, records=None, payload=None):
                     has_changed = True
                     # return the new record to the user in the returned var.
                     memset_api = new_record
-                    return(has_changed, has_failed, memset_api, msg)
+                    return has_changed, has_failed, memset_api, msg
                 has_failed, msg, response = memset_api_call(api_key=args['api_key'], api_method=api_method, payload=payload)
                 if not has_failed:
                     has_changed = True
@@ -247,7 +247,7 @@ def create_zone_record(args=None, zone_id=None, records=None, payload=None):
             has_changed = True
             # populate the return var with the new record's details.
             memset_api = new_record
-            return(has_changed, has_failed, memset_api, msg)
+            return has_changed, has_failed, memset_api, msg
         has_failed, msg, response = memset_api_call(api_key=args['api_key'], api_method=api_method, payload=payload)
         if not has_failed:
             has_changed = True
@@ -255,7 +255,7 @@ def create_zone_record(args=None, zone_id=None, records=None, payload=None):
             #  empty msg as we don't want to return a boatload of json to the user.
             msg = None
 
-    return(has_changed, has_failed, memset_api, msg)
+    return has_changed, has_failed, memset_api, msg
 
 
 def delete_zone_record(args=None, records=None, payload=None):
@@ -271,7 +271,7 @@ def delete_zone_record(args=None, records=None, payload=None):
         for zone_record in records:
             if args['check_mode']:
                 has_changed = True
-                return(has_changed, has_failed, memset_api, msg)
+                return has_changed, has_failed, memset_api, msg
             payload['id'] = zone_record['id']
             api_method = 'dns.zone_record_delete'
             has_failed, msg, response = memset_api_call(api_key=args['api_key'], api_method=api_method, payload=payload)
@@ -281,7 +281,7 @@ def delete_zone_record(args=None, records=None, payload=None):
                 #  empty msg as we don't want to return a boatload of json to the user.
                 msg = None
 
-    return(has_changed, has_failed, memset_api, msg)
+    return has_changed, has_failed, memset_api, msg
 
 
 def create_or_delete(args=None):
@@ -305,7 +305,7 @@ def create_or_delete(args=None):
         retvals['failed'] = _has_failed
         retvals['msg'] = msg
         retvals['stderr'] = "API returned an error: {0}" . format(response.status_code)
-        return(retvals)
+        return retvals
 
     zone_exists, _msg, counter, zone_id = get_zone_id(zone_name=args['zone'], current_zones=response.json())
 
@@ -318,7 +318,7 @@ def create_or_delete(args=None):
         retvals['failed'] = has_failed
         retvals['msg'] = stderr
         retvals['stderr'] = stderr
-        return(retvals)
+        return retvals
 
     # get a list of all records ( as we can't limit records by zone)
     api_method = 'dns.zone_record_list'
@@ -340,7 +340,7 @@ def create_or_delete(args=None):
         if val is not None:
             retvals[val] = eval(val)
 
-    return(retvals)
+    return retvals
 
 
 def main():

plugins/modules/cloud/misc/rhevm.py

@@ -1253,7 +1253,6 @@ def setChanged():
 
 
 def setMsg(message):
-    global failed
     msg.append(message)
 
 

plugins/modules/cloud/opennebula/one_image.py

@@ -349,7 +349,7 @@ def get_connection_info(module):
     if not password:
         password = os.environ.get('ONE_PASSWORD')
 
-    if not(url and username and password):
+    if not (url and username and password):
         module.fail_json(msg="One or more connection parameters (api_url, api_username, api_password) were not specified")
     from collections import namedtuple
 

plugins/modules/cloud/opennebula/one_image_info.py

@@ -243,7 +243,7 @@ def get_connection_info(module):
     if not password:
         password = os.environ.get('ONE_PASSWORD')
 
-    if not(url and username and password):
+    if not (url and username and password):
         module.fail_json(msg="One or more connection parameters (api_url, api_username, api_password) were not specified")
     from collections import namedtuple
 

plugins/modules/cloud/opennebula/one_service.py

@@ -664,7 +664,7 @@ def get_connection_info(module):
     if not password:
         password = os.environ.get('ONEFLOW_PASSWORD')
 
-    if not(url and username and password):
+    if not (url and username and password):
         module.fail_json(msg="One or more connection parameters (api_url, api_username, api_password) were not specified")
     from collections import namedtuple
 

plugins/modules/cloud/packet/packet_ip_subnet.py

@@ -217,7 +217,7 @@ def parse_subnet_cidr(cidr):
     try:
         prefixlen = int(prefixlen)
     except ValueError:
-        raise("Wrong prefix length in CIDR expression {0}".format(cidr))
+        raise Exception("Wrong prefix length in CIDR expression {0}".format(cidr))
     return addr, prefixlen
 
 

plugins/modules/cloud/profitbricks/profitbricks_datacenter.py

@@ -184,7 +184,7 @@ def remove_datacenter(module, profitbricks):
     name = module.params.get('name')
     changed = False
 
-    if(uuid_match.match(name)):
+    if uuid_match.match(name):
         _remove_datacenter(module, profitbricks, name)
         changed = True
     else:

plugins/modules/cloud/profitbricks/profitbricks_volume.py

@@ -325,7 +325,7 @@ def delete_volume(module, profitbricks):
                 break
 
     for n in instance_ids:
-        if(uuid_match.match(n)):
+        if uuid_match.match(n):
             _delete_volume(module, profitbricks, datacenter, n)
             changed = True
         else:

plugins/modules/cloud/scaleway/scaleway_security_group_rule.py

@@ -143,6 +143,7 @@ except ImportError:
     IPADDRESS_IMP_ERR = traceback.format_exc()
     HAS_IPADDRESS = False
 else:
+    IPADDRESS_IMP_ERR = None
     HAS_IPADDRESS = True