pre-commit: enable Python flake8 rule E271 (#9358)

Author: jbampton

.github/linters/.flake8

@@ -22,6 +22,7 @@
 # E224 Tab after operator
 # E227 Missing whitespace around bitwise or shift operator
 # E242 Tab after ','
+# E271 Multiple spaces after keyword
 # E273 Tab after keyword
 # E274 Tab before keyword
 # E713 Test for membership should be 'not in'
@@ -38,4 +39,4 @@
 exclude =
     .git,
     venv
-select = E112,E113,E133,E223,E224,E227,E242,E273,E274,E713,E742,E743,E901,E902,W291,W292,W293,W391
+select = E112,E113,E133,E223,E224,E227,E242,E271,E273,E274,E713,E742,E743,E901,E902,W291,W292,W293,W391

python/lib/cloud_utils.py

@@ -375,7 +375,7 @@ def list_zonespods(host):
 	x = [ (zonename,podname)
 		for pod in dom.childNodes[0].childNodes
 		for podname in [ x.childNodes[0].wholeText for x in pod.childNodes if x.tagName == "name" ]
-		for zonename in  [ x.childNodes[0].wholeText for x in pod.childNodes if x.tagName == "zonename" ]
+		for zonename in [ x.childNodes[0].wholeText for x in pod.childNodes if x.tagName == "zonename" ]
 		]
 	return x
 

python/lib/cloudutils/syscfg.py

@@ -114,7 +114,7 @@ def check(self):
                    pass
 
                 if size != -1 and size < (30 * 1024 * 1024):
-                    raise  CloudRuntimeException("Need at least 30G free disk space under /var/lib/libvirt/images")
+                    raise CloudRuntimeException("Need at least 30G free disk space under /var/lib/libvirt/images")
 
             #check memory
             mem = -1
@@ -124,7 +124,7 @@ def check(self):
                 pass
 
             if mem != -1 and mem < 1:
-                raise  CloudRuntimeException("Need at least 1G memory")
+                raise CloudRuntimeException("Need at least 1G memory")
 
 
         if os.geteuid() != 0:

python/lib/cloudutils/utilities.py

@@ -47,11 +47,11 @@ def alarm_handler(signum, frame):
                     alarm(0)
             except Alarm:
                 os.kill(self.process.pid, SIGKILL)
-                raise  CloudRuntimeException("Timeout during command execution")
+                raise CloudRuntimeException("Timeout during command execution")
 
             self.success = self.process.returncode == 0
         except:
-            raise  CloudRuntimeException(formatExceptionInfo())
+            raise CloudRuntimeException(formatExceptionInfo())
 
         if not self.success:
             logging.debug("Failed to execute:" + self.getErrMsg())

systemvm/debian/root/monitorServices.py

@@ -67,7 +67,7 @@ def getServicesConfig( config_file_path = "/etc/monitor.conf" ):
             process_dict[section][name] = value
             printd (" %s = %r" % (name, value))
 
-    return  process_dict
+    return process_dict
 
 def printd (msg):
     """

test/integration/component/maint/testpath_vMotion_vmware.py

@@ -1190,7 +1190,7 @@ def test_02_vm_and_volumes_live_migration_for_vmware_vmfs_local_storage(self, fi
         a) Create VM snapshots to check data integrity - @method used : VmSnapshotToCheckDataIntegrity(self, vm)
         c) Check for VM accessibility by sshing to the VM - @method used : check_for_vm_access_by_ssh_using_nat(self, virtual_machine_1)
         """
-        if  not self.zone.localstorageenabled:
+        if not self.zone.localstorageenabled:
             raise self.skipTest("The setup doesn't have local storage enabled")
         scope = first_value
         ostype = second_value

test/integration/component/test_interop_xd_ccp.py

@@ -571,7 +571,7 @@ def test_10_detach_volume(self):
             id=self.volume.id
         )
 
-        if  list_volume_response1[0].virtualmachineid is None:
+        if list_volume_response1[0].virtualmachineid is None:
             self.skipTest("Check if volume is attached to the VM before detach")
 
         self.virtual_machine.detach_volume(self.user_api_client, self.volume)
@@ -618,7 +618,7 @@ def test_11_delete_detached_volume(self):
             id=self.volume.id
         )
 
-        if  list_volume_response1[0].virtualmachineid is not None:
+        if list_volume_response1[0].virtualmachineid is not None:
             self.skipTest("Check if volume is detached before deleting")
 
         cmd = deleteVolume.deleteVolumeCmd()

test/integration/component/test_rootvolume_resize.py

@@ -647,7 +647,7 @@ def test_03_vmsnapshot__on_resized_rootvolume_vm(self):
                     self.assertEqual(virtualmachine_snapshot.id,
                                      virtulmachine_snapshot_list[0].id,
                                      "Virtual Machine Snapshot id do not match")
-                except Exception as  e:
+                except Exception as e:
                     raise Exception("Issue CLOUDSTACK-10080: Exception while performing"
                                     " vmsnapshot: %s" % e)
             else:

test/integration/smoke/test_kubernetes_clusters.py

@@ -766,7 +766,7 @@ def getValidKubernetesCluster(self, size=1, control_nodes=1, version={}):
                 self.verifyKubernetesCluster(cluster, cluster.name, None, size, control_nodes)
                 self.debug("Existing Kubernetes cluster available with name %s" % cluster.name)
                 return cluster
-            except  AssertionError as error:
+            except AssertionError as error:
                 self.debug("Existing cluster failed verification due to %s, need to deploy a new one" % error)
                 self.deleteKubernetesClusterAndVerify(cluster.id, False, True)
 

test/integration/smoke/test_privategw_acl.py

@@ -920,6 +920,6 @@ def get_guest_traffic_physical_network(self, apiclient, zoneid):
                     (select id from physical_network where uuid='%s');" % physical_network.id
                 )
                 for traffic_type in traffic_type_list:
-                    if "Guest" in  str(traffic_type[0]):
+                    if "Guest" in str(traffic_type[0]):
                         return physical_network
         return None