Index: tools/telemetry/telemetry/core/platform.py |
diff --git a/tools/telemetry/telemetry/core/platform.py b/tools/telemetry/telemetry/core/platform.py |
index a9566a945439a463ea277ae54c37cbe0c6a60087..2b2ba3e1be673bbb6be19445a8ba5bf94dd8c3ed 100644 |
--- a/tools/telemetry/telemetry/core/platform.py |
+++ b/tools/telemetry/telemetry/core/platform.py |
@@ -4,11 +4,11 @@ |
import logging as real_logging |
import os |
-from telemetry.core import discover |
from telemetry.core import network_controller |
from telemetry.core import tracing_controller |
from telemetry.core import util |
from telemetry.internal.platform import platform_backend as platform_backend_module |
+from telemetry.util import classes_util |
_host_platform = None |
@@ -39,9 +39,9 @@ def GetHostPlatform(): |
def _IterAllPlatformBackendClasses(): |
platform_dir = os.path.dirname( |
os.path.realpath(platform_backend_module.__file__)) |
- return discover.DiscoverClasses( |
+ return classes_util.DiscoverClasses( |
platform_dir, util.GetTelemetryDir(), |
- platform_backend_module.PlatformBackend).itervalues() |
+ platform_backend_module.PlatformBackend) |
def GetPlatformForDevice(device, finder_options, logging=real_logging): |