1 files changed, 10 insertions, 1 deletions
diff --git a/catapult/devil/devil/android/logcat_monitor_test.py b/catapult/devil/devil/android/logcat_monitor_test.py
index 7f2f10a6..356fe041 100755
--- a/catapult/devil/devil/android/logcat_monitor_test.py
+++ b/catapult/devil/devil/android/logcat_monitor_test.py
@@ -9,6 +9,8 @@ import itertools
 import threading
 import unittest
 
+import six
+
 from devil import devil_env
 from devil.android import logcat_monitor
 from devil.android.sdk import adb_wrapper
@@ -24,6 +26,13 @@ def _CreateTestLog(raw_logcat=None):
   return test_log
 
 
+def zip_longest(expected, actual):
+  # pylint: disable=no-member
+  if six.PY2:
+    return itertools.izip_longest(expected, actual)
+  else:
+    return itertools.zip_longest(expected, actual)
+
 class LogcatMonitorTest(unittest.TestCase):
 
   _TEST_THREADTIME_LOGCAT_DATA = [
@@ -44,7 +53,7 @@ class LogcatMonitorTest(unittest.TestCase):
   ]
 
   def assertIterEqual(self, expected_iter, actual_iter):
-    for expected, actual in itertools.izip_longest(expected_iter, actual_iter):
+    for expected, actual in zip_longest(expected_iter, actual_iter):
       self.assertIsNotNone(
           expected,
           msg='actual has unexpected elements starting with %s' % str(actual))