Lint

Author: Fryyyyy

libcloudforensics/providers/gcp/forensics.py

@@ -475,15 +475,15 @@ def VMRemoveServiceAccount(
   # Get the initial powered state of the instance
   initial_state = instance.GetPowerState()
 
-  if not initial_state in valid_starting_states:
+  if initial_state not in valid_starting_states:
     logger.error(
         'Instance "{0:s}" is currently {1:s} which is an invalid '
         'state for this operation'.format(instance_name, initial_state))
     return False
 
   try:
     # Stop the instance if it is not already (or on the way)....
-    if not initial_state in ('TERMINATED', 'STOPPING'):
+    if initial_state not in ('TERMINATED', 'STOPPING'):
       instance.Stop()
 
     # Remove the service account

libcloudforensics/providers/gcp/internal/compute.py

@@ -162,7 +162,8 @@ def _GetResourceFromComputeApi(
     """
     client = getattr(self.GceApi(), resource_type)()
     if zone or region:
-      param_name = resource_type[:-1] if resource_type.endswith('s') else resource_type
+      param_name = resource_type[:-1] if resource_type.endswith(
+          's') else resource_type
       if resource_type == 'instanceGroupManagers':
         param_name = 'instanceGroupManager'
       elif resource_type == 'regionDisks':

tests/providers/gcp/gcp_mocks.py

@@ -74,6 +74,7 @@
     'projects/fake-target-project/logs/OSConfigAgent'
 ]
 
+# pylint: disable=line-too-long
 FAKE_DISK_LIST = [
     {
         'name':
@@ -92,6 +93,7 @@
             '0123456789012345678'
     }
 ]
+# pylint: enable=line-too-long
 
 STARTUP_SCRIPT = 'scripts/startup.sh'
 

tests/providers/gcp/internal/test_compute.py

@@ -564,13 +564,13 @@ def testGetDisk(self, mock_get_operation, mock_get_disk):
     """Test that a disk is retrieved by its name, if existing."""
     mock_get_operation.return_value = gcp_mocks.MOCK_GCE_OPERATION_INSTANCES_GET
     mock_get_disk.return_value = gcp_mocks.FAKE_DISK
- 
+
     # Normal disk
     disk = gcp_mocks.FAKE_INSTANCE.GetDisk(gcp_mocks.FAKE_DISK.name)
     self.assertIsInstance(disk, compute.GoogleComputeDisk)
     self.assertEqual('fake-disk', disk.name)
     mock_get_disk.assert_called_with(disk_name='fake-disk', zone='fake-zone')
- 
+
     # Boot disk
     mock_get_disk.return_value = gcp_mocks.FAKE_BOOT_DISK
     disk = gcp_mocks.FAKE_INSTANCE.GetDisk(gcp_mocks.FAKE_BOOT_DISK.name)