diff --git a/android_env/components/app_screen_checker.py b/android_env/components/app_screen_checker.py index e68753d..c02ce51 100644 --- a/android_env/components/app_screen_checker.py +++ b/android_env/components/app_screen_checker.py @@ -15,13 +15,13 @@ """Determines if the current app screen matches an expected app screen.""" +from collections.abc import Sequence import enum import re import time -from typing import Callable, Optional, Sequence, Pattern +from typing import Callable, Optional, Pattern from absl import logging - from android_env.components import adb_call_parser as adb_call_parser_lib from android_env.components import errors from android_env.proto import adb_pb2 diff --git a/android_env/components/log_stream.py b/android_env/components/log_stream.py index fd09549..52d07a2 100644 --- a/android_env/components/log_stream.py +++ b/android_env/components/log_stream.py @@ -16,8 +16,9 @@ """Abstract class for handling a stream of logs from a simulator.""" import abc +from collections.abc import Sequence import threading -from typing import Generator, Sequence +from typing import Generator from absl import logging diff --git a/android_env/components/setup_step_interpreter.py b/android_env/components/setup_step_interpreter.py index 5e1cfc8..4bc35c0 100644 --- a/android_env/components/setup_step_interpreter.py +++ b/android_env/components/setup_step_interpreter.py @@ -15,9 +15,10 @@ """A component that parses and processes SetupSteps.""" +from collections.abc import Sequence import copy import time -from typing import Any, Sequence +from typing import Any from absl import logging from android_env.components import adb_call_parser as adb_call_parser_lib diff --git a/android_env/components/utils.py b/android_env/components/utils.py index 8f630c0..27e4aa9 100644 --- a/android_env/components/utils.py +++ b/android_env/components/utils.py @@ -15,7 +15,7 @@ """Utils for AndroidEnv.""" -from typing import Sequence +from collections.abc import Sequence from dm_env import specs import numpy as np diff --git a/android_env/wrappers/discrete_action_wrapper.py b/android_env/wrappers/discrete_action_wrapper.py index e9867d8..1a20ee7 100644 --- a/android_env/wrappers/discrete_action_wrapper.py +++ b/android_env/wrappers/discrete_action_wrapper.py @@ -15,7 +15,7 @@ """Wraps the AndroidEnv environment to provide discrete actions.""" -from typing import Sequence +from collections.abc import Sequence from android_env.components import action_type from android_env.wrappers import base_wrapper diff --git a/android_env/wrappers/image_rescale_wrapper.py b/android_env/wrappers/image_rescale_wrapper.py index c571563..e4a62dd 100644 --- a/android_env/wrappers/image_rescale_wrapper.py +++ b/android_env/wrappers/image_rescale_wrapper.py @@ -15,7 +15,7 @@ """Wraps the AndroidEnv environment to rescale the observations.""" -from typing import Sequence +from collections.abc import Sequence from android_env.wrappers import base_wrapper import dm_env diff --git a/android_env/wrappers/tap_action_wrapper.py b/android_env/wrappers/tap_action_wrapper.py index 4fd6e9e..a868725 100644 --- a/android_env/wrappers/tap_action_wrapper.py +++ b/android_env/wrappers/tap_action_wrapper.py @@ -15,7 +15,7 @@ """Wraps the AndroidEnv environment to provide tap actions of a given duration.""" -from typing import Sequence +from collections.abc import Sequence from android_env.components import action_type from android_env.wrappers import base_wrapper