Remove py-six dependecies from public/
Bug: 223079136
Test: bash run_tests.sh
acloud-dev create
Change-Id: I9c470739e760f3d6e5e91a00d6c59ca81dd96be4
diff --git a/public/actions/remote_instance_fvp_device_factory_test.py b/public/actions/remote_instance_fvp_device_factory_test.py
index 7433073..862c7c0 100644
--- a/public/actions/remote_instance_fvp_device_factory_test.py
+++ b/public/actions/remote_instance_fvp_device_factory_test.py
@@ -19,8 +19,6 @@
from unittest import mock
-import six
-
from acloud.create import avd_spec
from acloud.internal import constants
from acloud.internal.lib import android_build_client
@@ -80,7 +78,7 @@
"fip.bin\n"
"system-qemu.img\n"
"userdata.img\n"))
- with mock.patch.object(six.moves.builtins, "open", mock_open):
+ with mock.patch("builtins.open", mock_open):
factory.CreateInstance()
mock_create_gce.assert_called_once()
diff --git a/public/config.py b/public/config.py
index 0e60fc0..7c976e2 100755
--- a/public/config.py
+++ b/public/config.py
@@ -46,8 +46,6 @@
import logging
import os
-import six
-
from google.protobuf import text_format
# pylint: disable=no-name-in-module,import-error
@@ -163,15 +161,15 @@
self.ssh_public_key_path = usr_cfg.ssh_public_key_path
self.storage_bucket_name = usr_cfg.storage_bucket_name
self.metadata_variable = dict(
- six.iteritems(internal_cfg.default_usr_cfg.metadata_variable))
+ internal_cfg.default_usr_cfg.metadata_variable.items())
self.metadata_variable.update(usr_cfg.metadata_variable)
self.device_resolution_map = dict(
- six.iteritems(internal_cfg.device_resolution_map))
+ internal_cfg.device_resolution_map.items())
self.device_default_orientation_map = dict(
- six.iteritems(internal_cfg.device_default_orientation_map))
+ internal_cfg.device_default_orientation_map.items())
self.no_project_access_msg_map = dict(
- six.iteritems(internal_cfg.no_project_access_msg_map))
+ internal_cfg.no_project_access_msg_map.items())
self.min_machine_size = internal_cfg.min_machine_size
self.disk_image_name = internal_cfg.disk_image_name
self.disk_image_mime_type = internal_cfg.disk_image_mime_type
@@ -179,9 +177,9 @@
self.disk_raw_image_name = internal_cfg.disk_raw_image_name
self.disk_raw_image_extension = internal_cfg.disk_raw_image_extension
self.valid_branch_and_min_build_id = dict(
- six.iteritems(internal_cfg.valid_branch_and_min_build_id))
+ internal_cfg.valid_branch_and_min_build_id.items())
self.precreated_data_image_map = dict(
- six.iteritems(internal_cfg.precreated_data_image))
+ internal_cfg.precreated_data_image.items())
self.extra_data_disk_size_gb = (
usr_cfg.extra_data_disk_size_gb or
internal_cfg.default_usr_cfg.extra_data_disk_size_gb)
diff --git a/public/config_test.py b/public/config_test.py
index 28cfbdb..694ed6b 100644
--- a/public/config_test.py
+++ b/public/config_test.py
@@ -21,8 +21,6 @@
from unittest import mock
-import six
-
# pylint: disable=no-name-in-module,import-error
from acloud import errors
from acloud.internal.proto import internal_config_pb2
@@ -152,7 +150,7 @@
self.assertEqual(cfg.client_secret, "fake_client_secret")
self.assertEqual(cfg.extra_args_ssh_tunnel, "fake_extra_args_ssh_tunnel")
self.assertEqual(
- dict(six.iteritems(cfg.metadata_variable)),
+ dict(cfg.metadata_variable.items()),
{"metadata_1": "metadata_value_1"})
self.assertEqual(cfg.hw_property,
"cpu:3,resolution:1080x1920,dpi:480,memory:4g,"
@@ -224,17 +222,17 @@
self.assertEqual(cfg.default_usr_cfg.machine_type, "n1-standard-1")
self.assertEqual(cfg.default_usr_cfg.network, "default")
self.assertEqual(
- dict(six.iteritems(cfg.default_usr_cfg.metadata_variable)),
+ dict(cfg.default_usr_cfg.metadata_variable.items()),
{"metadata_1": "metadata_value_1",
"metadata_2": "metadata_value_2"})
self.assertEqual(
- dict(six.iteritems(cfg.device_resolution_map)),
+ dict(cfg.device_resolution_map.items()),
{"nexus5": "1080x1920x32x480"})
self.assertEqual(
- dict(six.iteritems(cfg.device_default_orientation_map)),
+ dict(cfg.device_default_orientation_map.items()),
{"nexus5": "portrait"})
self.assertEqual(
- dict(six.iteritems(cfg.valid_branch_and_min_build_id)),
+ dict(cfg.valid_branch_and_min_build_id.items()),
{"aosp-master": 0})
self.assertEqual(cfg.default_usr_cfg.stable_host_image_name,
"fake_stable_host_image_name")
@@ -259,7 +257,7 @@
# hw property
self.assertEqual(
- dict(six.iteritems(cfg.common_hw_property_map)),
+ dict(cfg.common_hw_property_map.items()),
{"phone": "cpu:2,resolution:1080x1920,dpi:420,memory:4g,disk:8g",
"auto": "cpu:4,resolution:1280x800,dpi:160,memory:4g"})
