PEP 8 cleanup. (#20789)

* PEP 8 E703 cleanup.
* PEP 8 E701 cleanup.
* PEP 8 E711 cleanup.
* PEP 8 W191 and E101 cleanup.

contrib/inventory/abiquo.py

@@ -55,7 +55,7 @@ from ansible.module_utils.urls import open_url
 
 def api_get(link, config):
     try:
-        if link == None:
+        if link is None:
             url = config.get('api','uri') + config.get('api','login_path')
             headers = {"Accept": config.get('api','login_type')}
         else:
@@ -148,7 +148,7 @@ def generate_inv_from_api(enterprise_entity,config):
             if ((config.getboolean('defaults', 'deployed_only') == True) and (vmcollection['state'] == 'NOT_ALLOCATED')):
                 vm_state = False
 
-            if not vm_nic == None and vm_state:
+            if vm_nic is not None and vm_state:
                 if vm_vapp not in inventory:
                     inventory[vm_vapp] = {}
                     inventory[vm_vapp]['children'] = []

contrib/inventory/apache-libcloud.py

@@ -297,7 +297,7 @@ class LibcloudInventory(object):
         '''
 
         if key in my_dict:
-            my_dict[key].append(element);
+            my_dict[key].append(element)
         else:
             my_dict[key] = [element]
 
@@ -358,4 +358,4 @@ def main():
     LibcloudInventory()
 
 if __name__ == '__main__':
-	main()
+    main()

contrib/inventory/cloudstack.py

@@ -179,7 +179,7 @@ class CloudStackInventory(object):
                     })
                     if nic['isdefault']:
                         data['default_ip'] = nic['ipaddress']
-                break;
+                break
         return data
 
 

contrib/inventory/consul_io.py

@@ -399,7 +399,7 @@ class ConsulInventory(object):
 
     new_dict = {}
     for k, v in d.items():
-      if v != None:
+      if v is not None:
         new_dict[self.to_safe(str(k))] = self.to_safe(str(v))
     return new_dict
 

contrib/inventory/ec2.py

@@ -442,7 +442,7 @@ class Ec2Inventory(object):
 
         # Do we need to exclude hosts that match a pattern?
         try:
-            pattern_exclude = config.get('ec2', 'pattern_exclude');
+            pattern_exclude = config.get('ec2', 'pattern_exclude')
             if pattern_exclude and len(pattern_exclude) > 0:
                 self.pattern_exclude = re.compile(pattern_exclude)
             else:

contrib/inventory/gce.py

@@ -428,8 +428,10 @@ class GceInventory(object):
             if zones and zone not in zones:
                 continue
 
-            if zone in groups: groups[zone].append(name)
-            else: groups[zone] = [name]
+            if zone in groups:
+                groups[zone].append(name)
+            else:
+                groups[zone] = [name]
 
             tags = node.extra['tags']
             for t in tags:
@@ -437,26 +439,36 @@ class GceInventory(object):
                     tag = t[6:]
                 else:
                     tag = 'tag_%s' % t
-                if tag in groups: groups[tag].append(name)
-                else: groups[tag] = [name]
+                if tag in groups:
+                    groups[tag].append(name)
+                else:
+                    groups[tag] = [name]
 
             net = node.extra['networkInterfaces'][0]['network'].split('/')[-1]
             net = 'network_%s' % net
-            if net in groups: groups[net].append(name)
-            else: groups[net] = [name]
+            if net in groups:
+                groups[net].append(name)
+            else:
+                groups[net] = [name]
 
             machine_type = node.size
-            if machine_type in groups: groups[machine_type].append(name)
-            else: groups[machine_type] = [name]
+            if machine_type in groups:
+                groups[machine_type].append(name)
+            else:
+                groups[machine_type] = [name]
 
             image = node.image and node.image or 'persistent_disk'
-            if image in groups: groups[image].append(name)
-            else: groups[image] = [name]
+            if image in groups:
+                groups[image].append(name)
+            else:
+                groups[image] = [name]
 
             status = node.extra['status']
             stat = 'status_%s' % status.lower()
-            if stat in groups: groups[stat].append(name)
-            else: groups[stat] = [name]
+            if stat in groups:
+                groups[stat].append(name)
+            else:
+                groups[stat] = [name]
 
         groups["_meta"] = meta
 

contrib/inventory/linode.py

@@ -300,7 +300,7 @@ class LinodeInventory(object):
     def push(self, my_dict, key, element):
         """Pushed an element onto an array that may not have been defined in the dict."""
         if key in my_dict:
-            my_dict[key].append(element);
+            my_dict[key].append(element)
         else:
             my_dict[key] = [element]
 

contrib/inventory/mdt_dynamic_inventory.py

@@ -69,9 +69,9 @@ class MDTInventory(object):
         Gets host from MDT Database
         '''
         if hostname:
-        	query = "SELECT t1.ID, t1.Description, t1.MacAddress, t2.Role FROM ComputerIdentity as t1 join Settings_Roles as t2 on t1.ID = t2.ID where t1.Description = '%s'" % hostname
+            query = "SELECT t1.ID, t1.Description, t1.MacAddress, t2.Role FROM ComputerIdentity as t1 join Settings_Roles as t2 on t1.ID = t2.ID where t1.Description = '%s'" % hostname
         else:
-        	query = 'SELECT t1.ID, t1.Description, t1.MacAddress, t2.Role FROM ComputerIdentity as t1 join Settings_Roles as t2 on t1.ID = t2.ID'
+            query = 'SELECT t1.ID, t1.Description, t1.MacAddress, t2.Role FROM ComputerIdentity as t1 join Settings_Roles as t2 on t1.ID = t2.ID'
         self._connect(query)
 
         # Configure to group name configured in Ansible Tower for this inventory

contrib/inventory/softlayer.py

@@ -95,7 +95,7 @@ class SoftLayerInventory(object):
         '''Push an element onto an array that may not have been defined in the dict'''
 
         if key in my_dict:
-            my_dict[key].append(element);
+            my_dict[key].append(element)
         else:
             my_dict[key] = [element]
 

contrib/inventory/spacewalk.py

@@ -110,9 +110,9 @@ parser.add_option('-H', '--human', dest="human",
                   default=False, action="store_true",
                   help="Produce a friendlier version of either server list or host detail")
 parser.add_option('-o', '--org', default=None, dest="org_number",
-		  help="Limit to spacewalk organization number")
+                  help="Limit to spacewalk organization number")
 parser.add_option('-p', default=False, dest="prefix_org_name", action="store_true",
-		  help="Prefix the group name with the organization number")
+                  help="Prefix the group name with the organization number")
 (options, args) = parser.parse_args()
 
 
@@ -133,13 +133,13 @@ if os.path.exists(INI_FILE):
 #------------------------------
 org_groups = {}
 try:
-	for group in spacewalk_report('system-groups'):
-	    org_groups[group['spacewalk_group_id']] = group['spacewalk_org_id']
+    for group in spacewalk_report('system-groups'):
+        org_groups[group['spacewalk_group_id']] = group['spacewalk_org_id']
 
 except (OSError) as e:
-	print('Problem executing the command "%s system-groups": %s' %
+    print('Problem executing the command "%s system-groups": %s' %
           (SW_REPORT, str(e)), file=sys.stderr)
-	sys.exit(2)
+    sys.exit(2)
 
 
 # List out the known server from Spacewalk

contrib/inventory/vmware_inventory.py

@@ -374,7 +374,7 @@ class VMWareInventory(object):
         if cfm is not None and cfm.field:
             for f in cfm.field:
                 if f.managedObjectType == vim.VirtualMachine:
-                    self.custom_fields[f.key] = f.name;
+                    self.custom_fields[f.key] = f.name
             self.debugl('%d custom fieds collected' % len(self.custom_fields))
         return instance_tuples
 

contrib/inventory/windows_azure.py

@@ -246,7 +246,7 @@ class AzureInventory(object):
     def push(self, my_dict, key, element):
         """Pushed an element onto an array that may not have been defined in the dict."""
         if key in my_dict:
-            my_dict[key].append(element);
+            my_dict[key].append(element)
         else:
             my_dict[key] = [element]
 

contrib/inventory/zabbix.py

@@ -55,9 +55,9 @@ class ZabbixInventory(object):
         config = ConfigParser.SafeConfigParser()
         conf_path = './zabbix.ini'
         if not os.path.exists(conf_path):
-	        conf_path = os.path.dirname(os.path.realpath(__file__)) + '/zabbix.ini'
+            conf_path = os.path.dirname(os.path.realpath(__file__)) + '/zabbix.ini'
         if os.path.exists(conf_path):
-	        config.read(conf_path)
+            config.read(conf_path)
         # server
         if config.has_option('zabbix', 'server'):
             self.zabbix_server = config.get('zabbix', 'server')