1 files changed, 3 insertions, 1 deletions
diff --git a/catapult/devil/devil/android/device_list.py b/catapult/devil/devil/android/device_list.py
index cd631dbd..5fb586f6 100644
--- a/catapult/devil/devil/android/device_list.py
+++ b/catapult/devil/devil/android/device_list.py
@@ -7,6 +7,8 @@ import json
 import logging
 import os
 
+import six
+
 logger = logging.getLogger(__name__)
 
 
@@ -26,7 +28,7 @@ def GetPersistentDeviceList(file_name):
     with open(file_name) as f:
       devices = json.load(f)
     if not isinstance(devices, list) or not all(
-        isinstance(d, basestring) for d in devices):
+        isinstance(d, six.string_types) for d in devices):
       logger.warning('Unrecognized device file format: %s', devices)
       return []
     return [d for d in devices if d != '(error)']