Remove py-six dependecies from gcompute_client. am: bedb9761de

Original change: https://android-review.googlesource.com/c/platform/tools/acloud/+/2019204

Change-Id: I47355c9ab4853e4a50af8bdaeb612ab9eb634afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 13 insertions, 19 deletions

diff --git a/internal/lib/gcompute_client.py b/internal/lib/gcompute_client.py
index b22dd7fd..b30b6868 100755
--- a/internal/lib/gcompute_client.py
+++ b/internal/lib/gcompute_client.py
@@ -33,8 +33,6 @@ import logging
 import os
 import re
 
-import six
-
 from acloud import errors
 from acloud.internal import constants
 from acloud.internal.lib import base_cloud_client
@@ -1050,14 +1048,14 @@ class ComputeClient(base_cloud_client.BaseCloudApiClient):
         # Initialize return values
         failed = []
         error_msgs = []
-        for resource_name, (_, error) in six.iteritems(results):
+        for resource_name, (_, error) in results.items():
             if error is not None:
                 failed.append(resource_name)
                 error_msgs.append(str(error))
         done = []
         # Wait for the executing operations to finish.
         logger.info("Waiting for executing operations")
-        for resource_name in six.iterkeys(requests):
+        for resource_name in requests.keys():
             operation, _ = results[resource_name]
             if operation:
                 try:
@@ -1312,7 +1310,7 @@ class ComputeClient(base_cloud_client.BaseCloudApiClient):
             metadata_list = [{
                 _METADATA_KEY: key,
                 _METADATA_KEY_VALUE: val
-            } for key, val in six.iteritems(metadata)]
+            } for key, val in metadata.items()]
             body[_METADATA] = {_ITEMS: metadata_list}
         logger.info("Creating instance: project %s, zone %s, body:%s",
                     self._project, zone, body)
diff --git a/internal/lib/gcompute_client_test.py b/internal/lib/gcompute_client_test.py
index 73e5d502..27eff81d 100644
--- a/internal/lib/gcompute_client_test.py
+++ b/internal/lib/gcompute_client_test.py
@@ -22,7 +22,6 @@ import os
 import unittest
 
 from unittest import mock
-import six
 
 # pylint: disable=import-error
 from acloud import errors
@@ -151,7 +150,7 @@ class ComputeClientTest(driver_test_lib.BaseDriverTest):
         self._SetupMocksForGetOperationStatus(
             {"error": {"errors": ["error1", "error2"]}},
             gcompute_client.OperationScope.GLOBAL)
-        six.assertRaisesRegex(self,
+        self.assertRaisesRegex(
                               errors.DriverError,
                               "Get operation state failed.*error1.*error2",
                               self.compute_client._GetOperationStatus,
@@ -342,8 +341,7 @@ class ComputeClientTest(driver_test_lib.BaseDriverTest):
                 "source": GS_IMAGE_SOURCE_URI,
             },
         }
-        six.assertRaisesRegex(
-            self,
+        self.assertRaisesRegex(
             errors.DriverError,
             "Expected fake error",
             self.compute_client.CreateImage,
@@ -1125,8 +1123,7 @@ class ComputeClientTest(driver_test_lib.BaseDriverTest):
                 instance=self.INSTANCE, zone=self.ZONE)
             self.assertEqual(result, "fake contents")
         else:
-            six.assertRaisesRegex(
-                self,
+            self.assertRaisesRegex(
                 errors.DriverError,
                 "Malformed response.*",
                 self.compute_client.GetSerialPortOutput,
@@ -1243,18 +1240,17 @@ class ComputeClientTest(driver_test_lib.BaseDriverTest):
         """Test the rsa key path not exists."""
         fake_ssh_rsa_path = "/path/to/test_rsa.pub"
         self.Patch(os.path, "exists", return_value=False)
-        six.assertRaisesRegex(self,
-                              errors.DriverError,
-                              "RSA file %s does not exist." % fake_ssh_rsa_path,
-                              gcompute_client.GetRsaKey,
-                              ssh_rsa_path=fake_ssh_rsa_path)
+        self.assertRaisesRegex(errors.DriverError,
+                               "RSA file %s does not exist." % fake_ssh_rsa_path,
+                               gcompute_client.GetRsaKey,
+                               ssh_rsa_path=fake_ssh_rsa_path)
 
     def testGetRsaKey(self):
         """Test get the rsa key."""
         fake_ssh_rsa_path = "/path/to/test_rsa.pub"
         self.Patch(os.path, "exists", return_value=True)
         m = mock.mock_open(read_data=self.SSHKEY)
-        with mock.patch.object(six.moves.builtins, "open", m):
+        with mock.patch("builtins.open", m):
             result = gcompute_client.GetRsaKey(fake_ssh_rsa_path)
             self.assertEqual(self.SSHKEY, result)
 
@@ -1386,7 +1382,7 @@ class ComputeClientTest(driver_test_lib.BaseDriverTest):
         self.Patch(
             gcompute_client.ComputeClient, "GetInstance",
             return_value=instance_metadata_key_not_exist)
-        with mock.patch.object(six.moves.builtins, "open", m):
+        with mock.patch("builtins.open", m):
             self.compute_client.AddSshRsaInstanceMetadata(
                 fake_user,
                 "/path/to/test_rsa.pub",
@@ -1402,7 +1398,7 @@ class ComputeClientTest(driver_test_lib.BaseDriverTest):
         self.Patch(
             gcompute_client.ComputeClient, "GetInstance",
             return_value=instance_metadata_key_exist)
-        with mock.patch.object(six.moves.builtins, "open", m):
+        with mock.patch("builtins.open", m):
             self.compute_client.AddSshRsaInstanceMetadata(
                 fake_user,
                 "/path/to/test_rsa.pub",