factory: Import xrange from six package
`xrange()` is deprecated and renamed to `range()` in Python3.
However, `range()` in Python2 performs differently than `xrange()`,
so this CL replaces the build-in `xrange()` by `six.xrange()` to
make the function calls compatible in both versions.
BUG=chromium:999876
TEST=make test
TEST=umpire test
TEST=make lint with key enable=xrange-builtin on
Change-Id: Ib7e16078b2c6eda3029634ed7be104a3c156ab71
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/factory/+/1868792
Reviewed-by: Yong Hong <yhong@chromium.org>
Commit-Queue: Yilin Yang <kerker@chromium.org>
Tested-by: Yilin Yang <kerker@chromium.org>
Auto-Submit: Yilin Yang <kerker@chromium.org>
diff --git a/devtools/instalog/get_attachments.py b/devtools/instalog/get_attachments.py
index 1e02e00..87ce8b8 100755
--- a/devtools/instalog/get_attachments.py
+++ b/devtools/instalog/get_attachments.py
@@ -19,6 +19,8 @@
import subprocess
import sys
+from six.moves import xrange
+
DATE_FORMAT = '%Y%m%d%H%M%S'
HASH_FILE_READ_BLOCK_SIZE = 1024 * 64 # 64kb
diff --git a/py/bundle_creator/docker/util.py b/py/bundle_creator/docker/util.py
index bf351cb..521d14a 100644
--- a/py/bundle_creator/docker/util.py
+++ b/py/bundle_creator/docker/util.py
@@ -12,6 +12,8 @@
import subprocess
import yaml
+from six.moves import xrange
+
from google.cloud import storage # pylint: disable=import-error, no-name-in-module
from google.protobuf import text_format
diff --git a/py/device/accelerometer.py b/py/device/accelerometer.py
index 9492a62..1d8fded 100644
--- a/py/device/accelerometer.py
+++ b/py/device/accelerometer.py
@@ -11,6 +11,7 @@
import struct
import time
+from six.moves import xrange
from six import viewitems
import factory_common # pylint: disable=unused-import
diff --git a/py/device/path.py b/py/device/path.py
index f2da776..f48cbc8 100644
--- a/py/device/path.py
+++ b/py/device/path.py
@@ -6,6 +6,8 @@
import posixpath
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import types
diff --git a/py/device/power.py b/py/device/power.py
index ffee9df..3a9adbd 100644
--- a/py/device/power.py
+++ b/py/device/power.py
@@ -9,6 +9,8 @@
import re
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import types
from cros.factory.utils import type_utils
diff --git a/py/device/sensor_utils.py b/py/device/sensor_utils.py
index b7c9527..9dc17e0 100644
--- a/py/device/sensor_utils.py
+++ b/py/device/sensor_utils.py
@@ -5,6 +5,7 @@
import os
import time
+from six.moves import xrange
from six import viewitems
import factory_common # pylint: disable=unused-import
diff --git a/py/device/touch.py b/py/device/touch.py
index 819957a..fe4c4c7 100644
--- a/py/device/touch.py
+++ b/py/device/touch.py
@@ -8,6 +8,8 @@
import struct
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import types
diff --git a/py/dkps/dkps_unittest.py b/py/dkps/dkps_unittest.py
index 1044597..7386f1d 100755
--- a/py/dkps/dkps_unittest.py
+++ b/py/dkps/dkps_unittest.py
@@ -14,6 +14,7 @@
import gnupg
from six import assertRaisesRegex
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.dkps import dkps
diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index f557893..4362125 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -25,6 +25,7 @@
import xmlrpclib
from six import iteritems
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.gooftool.common import ExecFactoryPar
diff --git a/py/gooftool/wipe.py b/py/gooftool/wipe.py
index bcc78e7..fd46913 100644
--- a/py/gooftool/wipe.py
+++ b/py/gooftool/wipe.py
@@ -15,6 +15,8 @@
import textwrap
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.gooftool import chroot
from cros.factory.gooftool.common import ExecFactoryPar
diff --git a/py/goofy/goofy_unittest.py b/py/goofy/goofy_unittest.py
index f799125..99ecc7a 100755
--- a/py/goofy/goofy_unittest.py
+++ b/py/goofy/goofy_unittest.py
@@ -24,6 +24,7 @@
import mox
from mox import IgnoreArg
from six import itervalues
+from six.moves import xrange
from ws4py.client import WebSocketBaseClient
import factory_common # pylint: disable=unused-import
diff --git a/py/goofy/plugins/system_log_manager_unittest.py b/py/goofy/plugins/system_log_manager_unittest.py
index ed3c7d1..a40dbb5 100755
--- a/py/goofy/plugins/system_log_manager_unittest.py
+++ b/py/goofy/plugins/system_log_manager_unittest.py
@@ -19,6 +19,7 @@
from urlparse import urlparse
import mox
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.test import server_proxy
diff --git a/py/goofy/test_list_iterator_unittest.py b/py/goofy/test_list_iterator_unittest.py
index b350618..6aa0522 100755
--- a/py/goofy/test_list_iterator_unittest.py
+++ b/py/goofy/test_list_iterator_unittest.py
@@ -8,6 +8,7 @@
import unittest
import mock
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.goofy import test_list_iterator
diff --git a/py/hwid/service/appengine/memcache_adaptor.py b/py/hwid/service/appengine/memcache_adaptor.py
index 3b03943..24544d3 100644
--- a/py/hwid/service/appengine/memcache_adaptor.py
+++ b/py/hwid/service/appengine/memcache_adaptor.py
@@ -7,6 +7,8 @@
import cPickle
import logging
+from six.moves import xrange
+
# pylint: disable=import-error, no-name-in-module
from google.appengine.api import memcache
diff --git a/py/hwid/v3/base32.py b/py/hwid/v3/base32.py
index 5d0ae26..785b396 100755
--- a/py/hwid/v3/base32.py
+++ b/py/hwid/v3/base32.py
@@ -9,6 +9,7 @@
import argparse
+from six.moves import xrange
from zlib import crc32
import factory_common # pylint: disable=unused-import
diff --git a/py/hwid/v3/base8192.py b/py/hwid/v3/base8192.py
index a8063fb..bf41bbe 100755
--- a/py/hwid/v3/base8192.py
+++ b/py/hwid/v3/base8192.py
@@ -9,6 +9,7 @@
import argparse
+from six.moves import xrange
from zlib import crc32
import factory_common # pylint: disable=unused-import
diff --git a/py/hwid/v3/builder.py b/py/hwid/v3/builder.py
index 98fee1a..e746d5e 100644
--- a/py/hwid/v3/builder.py
+++ b/py/hwid/v3/builder.py
@@ -14,6 +14,7 @@
import six
from six import iteritems
from six import itervalues
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.hwid.v3 import common
diff --git a/py/hwid/v3/builder_unittest.py b/py/hwid/v3/builder_unittest.py
index 9c83116..7c92ab6 100755
--- a/py/hwid/v3/builder_unittest.py
+++ b/py/hwid/v3/builder_unittest.py
@@ -8,6 +8,7 @@
import mock
from six import itervalues
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.hwid.v3 import builder
diff --git a/py/hwid/v3/configless_fields.py b/py/hwid/v3/configless_fields.py
index 40e9d51..fbfea4b 100644
--- a/py/hwid/v3/configless_fields.py
+++ b/py/hwid/v3/configless_fields.py
@@ -8,6 +8,8 @@
board / project specific database (e.g. HWID database).
"""
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.hwid.v3 import common
from cros.factory.test import device_data_constants
diff --git a/py/hwid/v3/database.py b/py/hwid/v3/database.py
index a7203a4..6200a1a 100644
--- a/py/hwid/v3/database.py
+++ b/py/hwid/v3/database.py
@@ -43,6 +43,7 @@
from six import iteritems
from six import itervalues
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.hwid.v3 import common
diff --git a/py/hwid/v3/identity.py b/py/hwid/v3/identity.py
index b95c9e4..b47a29a 100644
--- a/py/hwid/v3/identity.py
+++ b/py/hwid/v3/identity.py
@@ -45,6 +45,8 @@
import re
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.hwid.v3 import base32
from cros.factory.hwid.v3 import base8192
diff --git a/py/hwid/v3/verify_db_pattern.py b/py/hwid/v3/verify_db_pattern.py
index 315526f..5e8b0f4 100755
--- a/py/hwid/v3/verify_db_pattern.py
+++ b/py/hwid/v3/verify_db_pattern.py
@@ -24,6 +24,7 @@
import unittest
from six import itervalues
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.hwid.v3 import common
diff --git a/py/instalog/plugins/buffer_priority_file.py b/py/instalog/plugins/buffer_priority_file.py
index 530ef79..5198f07 100755
--- a/py/instalog/plugins/buffer_priority_file.py
+++ b/py/instalog/plugins/buffer_priority_file.py
@@ -25,6 +25,7 @@
import shutil
from six import iteritems
+from six.moves import xrange
import instalog_common # pylint: disable=unused-import
from instalog import json_utils
diff --git a/py/instalog/plugins/buffer_simple_file_unittest.py b/py/instalog/plugins/buffer_simple_file_unittest.py
index a7bdd77..f2745814 100755
--- a/py/instalog/plugins/buffer_simple_file_unittest.py
+++ b/py/instalog/plugins/buffer_simple_file_unittest.py
@@ -40,6 +40,8 @@
import time
import unittest
+from six.moves import xrange
+
import instalog_common # pylint: disable=unused-import
from instalog import datatypes
from instalog import log_utils
diff --git a/py/instalog/plugins/input_pull_socket.py b/py/instalog/plugins/input_pull_socket.py
index 7f385ae..b714f5c 100755
--- a/py/instalog/plugins/input_pull_socket.py
+++ b/py/instalog/plugins/input_pull_socket.py
@@ -14,6 +14,7 @@
from __future__ import print_function
+from six.moves import xrange
import socket
import instalog_common # pylint: disable=unused-import
diff --git a/py/instalog/plugins/output_archive_unittest.py b/py/instalog/plugins/output_archive_unittest.py
index 8a7089a..5acc8c4 100755
--- a/py/instalog/plugins/output_archive_unittest.py
+++ b/py/instalog/plugins/output_archive_unittest.py
@@ -20,6 +20,7 @@
import unittest
import psutil
+from six.moves import xrange
import instalog_common # pylint: disable=unused-import
from instalog import datatypes
diff --git a/py/instalog/plugins/output_pull_socket.py b/py/instalog/plugins/output_pull_socket.py
index 72e5b1b..fad2144 100755
--- a/py/instalog/plugins/output_pull_socket.py
+++ b/py/instalog/plugins/output_pull_socket.py
@@ -14,6 +14,7 @@
from __future__ import print_function
+from six.moves import xrange
import socket
import instalog_common # pylint: disable=unused-import
diff --git a/py/instalog/strptime_unittest.py b/py/instalog/strptime_unittest.py
index d74cfa7..61804cf 100755
--- a/py/instalog/strptime_unittest.py
+++ b/py/instalog/strptime_unittest.py
@@ -28,6 +28,8 @@
import time
import unittest
+from six.moves import xrange
+
error = False
diff --git a/py/probe/functions/edid_unittest.py b/py/probe/functions/edid_unittest.py
index 06c63b6..780644d 100755
--- a/py/probe/functions/edid_unittest.py
+++ b/py/probe/functions/edid_unittest.py
@@ -8,6 +8,7 @@
import mock
from six import assertCountEqual
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.probe.functions import edid
diff --git a/py/test/event_log_unittest.py b/py/test/event_log_unittest.py
index a9bc251..b4a564f 100755
--- a/py/test/event_log_unittest.py
+++ b/py/test/event_log_unittest.py
@@ -21,6 +21,7 @@
import uuid
import mock
+from six.moves import xrange
import yaml
import factory_common # pylint: disable=unused-import
diff --git a/py/test/event_log_watcher_unittest.py b/py/test/event_log_watcher_unittest.py
index 346e0e0..33c8dfe 100755
--- a/py/test/event_log_watcher_unittest.py
+++ b/py/test/event_log_watcher_unittest.py
@@ -11,6 +11,7 @@
import unittest
import mox
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.test import event_log
diff --git a/py/test/fixture/dolphin/plankton_hdmi.py b/py/test/fixture/dolphin/plankton_hdmi.py
index 69eebf2..e4c446f 100644
--- a/py/test/fixture/dolphin/plankton_hdmi.py
+++ b/py/test/fixture/dolphin/plankton_hdmi.py
@@ -19,6 +19,8 @@
import threading
import time
+from six.moves import xrange
+
class PlanktonHDMIException(Exception):
pass
diff --git a/py/test/fixture/touchscreen_calibration/fixture.py b/py/test/fixture/touchscreen_calibration/fixture.py
index 926547d..e989764 100644
--- a/py/test/fixture/touchscreen_calibration/fixture.py
+++ b/py/test/fixture/touchscreen_calibration/fixture.py
@@ -8,6 +8,8 @@
import threading
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.test import event
from cros.factory.test.i18n import _
diff --git a/py/test/fixture/whale/host/interrupt_handler.py b/py/test/fixture/whale/host/interrupt_handler.py
index ae7739c..2a62663 100755
--- a/py/test/fixture/whale/host/interrupt_handler.py
+++ b/py/test/fixture/whale/host/interrupt_handler.py
@@ -15,6 +15,7 @@
import time
from six import iteritems
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.test.fixture.whale import keyboard_emulator
diff --git a/py/test/fixture/whale/servo_config.py b/py/test/fixture/whale/servo_config.py
index 6a809c3..e94f9a1 100644
--- a/py/test/fixture/whale/servo_config.py
+++ b/py/test/fixture/whale/servo_config.py
@@ -12,6 +12,8 @@
import glob
import os
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
try:
from cros.factory.utils import type_utils
diff --git a/py/test/fixture/whale/whale_bft_fixture.py b/py/test/fixture/whale/whale_bft_fixture.py
index d750d19..bab70b8 100644
--- a/py/test/fixture/whale/whale_bft_fixture.py
+++ b/py/test/fixture/whale/whale_bft_fixture.py
@@ -10,6 +10,7 @@
import os
from six import iteritems
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.test.fixture import bft_fixture as bft
diff --git a/py/test/l10n/regions.py b/py/test/l10n/regions.py
index 0127cc9..9f3c2ee 100755
--- a/py/test/l10n/regions.py
+++ b/py/test/l10n/regions.py
@@ -17,6 +17,8 @@
import subprocess
import sys
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.test.env import paths
from cros.factory.utils import file_utils
diff --git a/py/test/pytests/accelerometers.py b/py/test/pytests/accelerometers.py
index a13203f..489ffc3 100644
--- a/py/test/pytests/accelerometers.py
+++ b/py/test/pytests/accelerometers.py
@@ -55,6 +55,8 @@
from six import iteritems
from six import viewkeys
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import accelerometer
from cros.factory.device import device_utils
diff --git a/py/test/pytests/accelerometers_calibration.py b/py/test/pytests/accelerometers_calibration.py
index cd59944..6376125 100644
--- a/py/test/pytests/accelerometers_calibration.py
+++ b/py/test/pytests/accelerometers_calibration.py
@@ -54,6 +54,8 @@
}
"""
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import accelerometer
from cros.factory.device import device_utils
diff --git a/py/test/pytests/audio.py b/py/test/pytests/audio.py
index 397ce0b..79f21bf 100644
--- a/py/test/pytests/audio.py
+++ b/py/test/pytests/audio.py
@@ -68,6 +68,8 @@
import os
import random
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test import i18n
diff --git a/py/test/pytests/audio_basic.py b/py/test/pytests/audio_basic.py
index 9e39e88..4d63375 100644
--- a/py/test/pytests/audio_basic.py
+++ b/py/test/pytests/audio_basic.py
@@ -43,6 +43,8 @@
import logging
import os
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.i18n import _
diff --git a/py/test/pytests/audio_loop.py b/py/test/pytests/audio_loop.py
index eb56dab..f69e295 100644
--- a/py/test/pytests/audio_loop.py
+++ b/py/test/pytests/audio_loop.py
@@ -151,6 +151,7 @@
from six import viewitems
from six import viewvalues
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.device.audio import base
diff --git a/py/test/pytests/battery_current.py b/py/test/pytests/battery_current.py
index a40aa02..13d0a2a 100644
--- a/py/test/pytests/battery_current.py
+++ b/py/test/pytests/battery_current.py
@@ -66,6 +66,8 @@
import logging
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.i18n import _
diff --git a/py/test/pytests/blocking_charge.py b/py/test/pytests/blocking_charge.py
index 82593a7..db9b534 100644
--- a/py/test/pytests/blocking_charge.py
+++ b/py/test/pytests/blocking_charge.py
@@ -83,6 +83,8 @@
import logging
import os
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.env import paths
diff --git a/py/test/pytests/bluetooth.py b/py/test/pytests/bluetooth.py
index 18e993c..74e67ba 100644
--- a/py/test/pytests/bluetooth.py
+++ b/py/test/pytests/bluetooth.py
@@ -86,6 +86,7 @@
import time
from six import iteritems
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
diff --git a/py/test/pytests/button.py b/py/test/pytests/button.py
index 36da37f..6e8f584 100644
--- a/py/test/pytests/button.py
+++ b/py/test/pytests/button.py
@@ -61,6 +61,8 @@
import logging
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.external import evdev
diff --git a/py/test/pytests/buzzer.py b/py/test/pytests/buzzer.py
index 1f5e37a..f8316a7 100644
--- a/py/test/pytests/buzzer.py
+++ b/py/test/pytests/buzzer.py
@@ -7,6 +7,8 @@
import random
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.test.i18n import _
from cros.factory.test import test_case
diff --git a/py/test/pytests/display_images.py b/py/test/pytests/display_images.py
index 7dc8a43..92c61c9 100644
--- a/py/test/pytests/display_images.py
+++ b/py/test/pytests/display_images.py
@@ -22,6 +22,8 @@
import logging
import os
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.i18n import _
diff --git a/py/test/pytests/ethernet.py b/py/test/pytests/ethernet.py
index 6127e22..2111e6b 100644
--- a/py/test/pytests/ethernet.py
+++ b/py/test/pytests/ethernet.py
@@ -7,6 +7,8 @@
import logging
import re
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.i18n import _
diff --git a/py/test/pytests/external_display.py b/py/test/pytests/external_display.py
index eb2f2b6..80a9745 100644
--- a/py/test/pytests/external_display.py
+++ b/py/test/pytests/external_display.py
@@ -71,6 +71,8 @@
import logging
import random
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.fixture import bft_fixture
diff --git a/py/test/pytests/factory_state_unittest.py b/py/test/pytests/factory_state_unittest.py
index 9ffe7d2..e87b94a 100755
--- a/py/test/pytests/factory_state_unittest.py
+++ b/py/test/pytests/factory_state_unittest.py
@@ -11,6 +11,7 @@
import mock
from six import assertCountEqual
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.goofy import goofy_server
diff --git a/py/test/pytests/fan_speed.py b/py/test/pytests/fan_speed.py
index e6f38b6..edfcbb9 100644
--- a/py/test/pytests/fan_speed.py
+++ b/py/test/pytests/fan_speed.py
@@ -27,6 +27,8 @@
import logging
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.i18n import _
diff --git a/py/test/pytests/gyroscope.py b/py/test/pytests/gyroscope.py
index 7219b5b..a6c6372 100644
--- a/py/test/pytests/gyroscope.py
+++ b/py/test/pytests/gyroscope.py
@@ -43,6 +43,7 @@
import collections
from six import iteritems
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
diff --git a/py/test/pytests/gyroscope_calibration.py b/py/test/pytests/gyroscope_calibration.py
index b335080..8d97096 100644
--- a/py/test/pytests/gyroscope_calibration.py
+++ b/py/test/pytests/gyroscope_calibration.py
@@ -29,6 +29,8 @@
}
"""
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.i18n import _
diff --git a/py/test/pytests/light_sensor_calibration.py b/py/test/pytests/light_sensor_calibration.py
index f6f28ed..5ba24f8 100644
--- a/py/test/pytests/light_sensor_calibration.py
+++ b/py/test/pytests/light_sensor_calibration.py
@@ -144,6 +144,7 @@
import time
import numpy as np
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.device import ambient_light_sensor
diff --git a/py/test/pytests/power_under_stress.py b/py/test/pytests/power_under_stress.py
index 932539e..ead5217 100644
--- a/py/test/pytests/power_under_stress.py
+++ b/py/test/pytests/power_under_stress.py
@@ -4,6 +4,8 @@
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.fixture import bft_fixture
diff --git a/py/test/pytests/sample_customized_test.py b/py/test/pytests/sample_customized_test.py
index af03918..61c8031 100644
--- a/py/test/pytests/sample_customized_test.py
+++ b/py/test/pytests/sample_customized_test.py
@@ -42,6 +42,8 @@
import logging
import unittest
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.testlog import testlog
diff --git a/py/test/pytests/storage_simple_stress.py b/py/test/pytests/storage_simple_stress.py
index 2bf26f1..e782e99 100644
--- a/py/test/pytests/storage_simple_stress.py
+++ b/py/test/pytests/storage_simple_stress.py
@@ -60,6 +60,8 @@
import time
import unittest
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.utils.arg_utils import Arg
diff --git a/py/test/pytests/sync_factory_server.py b/py/test/pytests/sync_factory_server.py
index 379e5ba..189d663 100644
--- a/py/test/pytests/sync_factory_server.py
+++ b/py/test/pytests/sync_factory_server.py
@@ -136,6 +136,8 @@
import threading
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.gooftool import commands
diff --git a/py/test/pytests/touch_uniformity.py b/py/test/pytests/touch_uniformity.py
index aeb6b2c..c30f49d 100644
--- a/py/test/pytests/touch_uniformity.py
+++ b/py/test/pytests/touch_uniformity.py
@@ -29,6 +29,8 @@
import collections
import logging
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test import event_log # TODO(chuntsen): Deprecate event log.
diff --git a/py/test/pytests/touchpad.py b/py/test/pytests/touchpad.py
index 8d34e36..555e75e 100644
--- a/py/test/pytests/touchpad.py
+++ b/py/test/pytests/touchpad.py
@@ -48,6 +48,8 @@
import logging
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.external import evdev
from cros.factory.test import session
diff --git a/py/test/pytests/touchpad_hover.py b/py/test/pytests/touchpad_hover.py
index e39665e..1c199a7 100644
--- a/py/test/pytests/touchpad_hover.py
+++ b/py/test/pytests/touchpad_hover.py
@@ -69,6 +69,8 @@
import contextlib
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.external import evdev
diff --git a/py/test/pytests/vsync.py b/py/test/pytests/vsync.py
index 26f2e5e..73ac95f 100644
--- a/py/test/pytests/vsync.py
+++ b/py/test/pytests/vsync.py
@@ -30,6 +30,8 @@
import os
import stat
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.test.i18n import _
diff --git a/py/test/pytests/wireless_antenna.py b/py/test/pytests/wireless_antenna.py
index f8f2ebb..0744e0c 100644
--- a/py/test/pytests/wireless_antenna.py
+++ b/py/test/pytests/wireless_antenna.py
@@ -65,8 +65,6 @@
import subprocess
import sys
-from six import iteritems
-
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
from cros.factory.device import wifi
diff --git a/py/test/rf/e5071c_mock.py b/py/test/rf/e5071c_mock.py
index adeaeeb..a581e6d 100755
--- a/py/test/rf/e5071c_mock.py
+++ b/py/test/rf/e5071c_mock.py
@@ -23,6 +23,8 @@
import SocketServer
import threading
+from six.moves import xrange
+
from scpi_mock import MockServerHandler
from scpi_mock import MockTestServer
diff --git a/py/test/rf/e5071c_scpi.py b/py/test/rf/e5071c_scpi.py
index c5144b0..0761ccf 100644
--- a/py/test/rf/e5071c_scpi.py
+++ b/py/test/rf/e5071c_scpi.py
@@ -14,6 +14,8 @@
import logging
import urllib
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.test.rf import agilent_scpi
from cros.factory.test.rf import lan_scpi
diff --git a/py/test/rf/n1914a.py b/py/test/rf/n1914a.py
index b03a10b..ac8894a 100644
--- a/py/test/rf/n1914a.py
+++ b/py/test/rf/n1914a.py
@@ -13,6 +13,8 @@
import struct
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.test.rf import agilent_scpi
from cros.factory.test.rf import lan_scpi
diff --git a/py/test/rf/n1914a_speed_test.py b/py/test/rf/n1914a_speed_test.py
index 672d6c1..a27ef91 100755
--- a/py/test/rf/n1914a_speed_test.py
+++ b/py/test/rf/n1914a_speed_test.py
@@ -16,6 +16,8 @@
import argparse
import time
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.test.rf.n1914a import N1914A
diff --git a/py/test/rules/phase_unittest.py b/py/test/rules/phase_unittest.py
index 07e1fea..469c1eb 100755
--- a/py/test/rules/phase_unittest.py
+++ b/py/test/rules/phase_unittest.py
@@ -10,6 +10,7 @@
import unittest
from six import assertRaisesRegex
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.test.rules import phase
diff --git a/py/test/rules/registration_codes_unittest.py b/py/test/rules/registration_codes_unittest.py
index 8a7899c..6d757b7 100755
--- a/py/test/rules/registration_codes_unittest.py
+++ b/py/test/rules/registration_codes_unittest.py
@@ -9,6 +9,7 @@
import unittest
from six import assertRaisesRegex
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.proto import reg_code_pb2
diff --git a/py/test/session_unittest.py b/py/test/session_unittest.py
index 4705d29..e7f5cc1 100755
--- a/py/test/session_unittest.py
+++ b/py/test/session_unittest.py
@@ -16,6 +16,7 @@
import mock
from six import assertRegex
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.test import session
diff --git a/py/test/test_lists/manager_unittest.py b/py/test/test_lists/manager_unittest.py
index 1f5eb18..31155f6 100755
--- a/py/test/test_lists/manager_unittest.py
+++ b/py/test/test_lists/manager_unittest.py
@@ -14,6 +14,7 @@
import mock
from six import assertCountEqual
from six import iteritems
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.test import device_data
diff --git a/py/test/test_ui_unittest.py b/py/test/test_ui_unittest.py
index c8a8d21..7694cfd 100755
--- a/py/test/test_ui_unittest.py
+++ b/py/test/test_ui_unittest.py
@@ -17,6 +17,7 @@
import mock
from six import assertRegex
from six import iteritems
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.test import event as test_event
diff --git a/py/test/ui_templates.py b/py/test/ui_templates.py
index 0d679ba..de30db9 100644
--- a/py/test/ui_templates.py
+++ b/py/test/ui_templates.py
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+from six.moves import xrange
+
class Option(object):
"""Utility class for generating and manipulating HTML option tag.
diff --git a/py/test/utils/drm_utils.py b/py/test/utils/drm_utils.py
index 45b260e..1938260 100644
--- a/py/test/utils/drm_utils.py
+++ b/py/test/utils/drm_utils.py
@@ -15,6 +15,8 @@
import mmap
import os
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.external import PIL
diff --git a/py/test/utils/kbd_leds.py b/py/test/utils/kbd_leds.py
index c6460cd..35308f4 100755
--- a/py/test/utils/kbd_leds.py
+++ b/py/test/utils/kbd_leds.py
@@ -13,6 +13,8 @@
import sys
import threading
+from six.moves import xrange
+
# Constants from /usr/include/linux/kd.h.
KDSETLED = 0x4B32
diff --git a/py/test/utils/pytest_utils_unittest.py b/py/test/utils/pytest_utils_unittest.py
index 8bf5745..4d897aa 100755
--- a/py/test/utils/pytest_utils_unittest.py
+++ b/py/test/utils/pytest_utils_unittest.py
@@ -10,6 +10,8 @@
import tempfile
import unittest
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.test.utils.pytest_utils import LoadPytestModule
from cros.factory.utils import file_utils
diff --git a/py/testlog/testlog_seq_unittest.py b/py/testlog/testlog_seq_unittest.py
index 3abce81..26f023d 100755
--- a/py/testlog/testlog_seq_unittest.py
+++ b/py/testlog/testlog_seq_unittest.py
@@ -17,6 +17,8 @@
import time
import unittest
+from six.moves import xrange
+
from testlog_pkg import testlog_seq
from testlog_pkg.utils import file_utils
diff --git a/py/testlog/testlog_validator.py b/py/testlog/testlog_validator.py
index f66b6ae..af6ce54 100644
--- a/py/testlog/testlog_validator.py
+++ b/py/testlog/testlog_validator.py
@@ -10,6 +10,8 @@
import re
import shutil
+from six.moves import xrange
+
from .utils import time_utils
diff --git a/py/toolkit/installer.py b/py/toolkit/installer.py
index 54e74a6..f39a0c3 100755
--- a/py/toolkit/installer.py
+++ b/py/toolkit/installer.py
@@ -24,6 +24,7 @@
import time
from six.moves import input
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.test.env import paths
diff --git a/py/toolkit/print_repo_status.py b/py/toolkit/print_repo_status.py
index c2fdca7..387faf7 100755
--- a/py/toolkit/print_repo_status.py
+++ b/py/toolkit/print_repo_status.py
@@ -15,6 +15,8 @@
import argparse
import os
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.utils.cros_board_utils import BuildBoard
from cros.factory.utils.process_utils import CheckOutput
diff --git a/py/tools/netboot_firmware_settings.py b/py/tools/netboot_firmware_settings.py
index b5f76d1..7c58311 100755
--- a/py/tools/netboot_firmware_settings.py
+++ b/py/tools/netboot_firmware_settings.py
@@ -14,6 +14,7 @@
import sys
from six import iteritems
+from six.moves import xrange
import factory_common # pylint:disable=unused-import
from cros.factory.utils import fmap
diff --git a/py/tools/run_tests.py b/py/tools/run_tests.py
index 997310f..ecfedac 100755
--- a/py/tools/run_tests.py
+++ b/py/tools/run_tests.py
@@ -24,6 +24,7 @@
from six import iteritems
from six import itervalues
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.utils.debug_utils import SetupLogging
diff --git a/py/tools/time_sanitizer.py b/py/tools/time_sanitizer.py
index ca8c1eb..c18359d 100755
--- a/py/tools/time_sanitizer.py
+++ b/py/tools/time_sanitizer.py
@@ -16,6 +16,8 @@
import time
from urlparse import urlparse
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.test.env import paths
from cros.factory.test import server_proxy
diff --git a/py/tools/time_sanitizer_unittest.py b/py/tools/time_sanitizer_unittest.py
index 31e89e9..0a8b369 100755
--- a/py/tools/time_sanitizer_unittest.py
+++ b/py/tools/time_sanitizer_unittest.py
@@ -13,6 +13,7 @@
import unittest
import mox
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.tools import time_sanitizer
diff --git a/py/umpire/server/migrations/0007.py b/py/umpire/server/migrations/0007.py
index 34ffd43..5597453 100644
--- a/py/umpire/server/migrations/0007.py
+++ b/py/umpire/server/migrations/0007.py
@@ -10,6 +10,8 @@
import os
import shutil
+from six.moves import xrange
+
_OLD_BUFFER_DIR = '/var/db/factory/umpire/umpire_data/instalog/data/buffer'
diff --git a/py/umpire/server/service/umpire_service_unittest.py b/py/umpire/server/service/umpire_service_unittest.py
index 3acb281..4c05a30 100755
--- a/py/umpire/server/service/umpire_service_unittest.py
+++ b/py/umpire/server/service/umpire_service_unittest.py
@@ -9,6 +9,7 @@
import os
import re
+from six.moves import xrange
from twisted.internet import defer
from twisted.internet import reactor
from twisted.trial import unittest
diff --git a/py/utils/arg_utils.py b/py/utils/arg_utils.py
index 4cc93e2..f0596e7 100644
--- a/py/utils/arg_utils.py
+++ b/py/utils/arg_utils.py
@@ -24,6 +24,7 @@
"""
from six import iteritems
+from six.moves import xrange
from .type_utils import Enum
diff --git a/py/utils/file_utils_unittest.py b/py/utils/file_utils_unittest.py
index d0ce15f..c22e357 100755
--- a/py/utils/file_utils_unittest.py
+++ b/py/utils/file_utils_unittest.py
@@ -22,6 +22,7 @@
import mock
import mox
from six import assertRaisesRegex
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.device import device_utils
diff --git a/py/utils/fmap.py b/py/utils/fmap.py
index 0ab4e75..e83af8e 100755
--- a/py/utils/fmap.py
+++ b/py/utils/fmap.py
@@ -30,6 +30,7 @@
import struct
import sys
+from six.moves import xrange
# constants imported from lib/fmap.h
FMAP_SIGNATURE = '__FMAP__'
diff --git a/py/utils/json_utils_unittest.py b/py/utils/json_utils_unittest.py
index de40ad6..366d66b 100755
--- a/py/utils/json_utils_unittest.py
+++ b/py/utils/json_utils_unittest.py
@@ -10,6 +10,7 @@
import unittest
from six import iteritems
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.utils import file_utils
diff --git a/py/utils/net_utils.py b/py/utils/net_utils.py
index 1af3ffa..efe4e1a 100644
--- a/py/utils/net_utils.py
+++ b/py/utils/net_utils.py
@@ -18,6 +18,8 @@
import time
import xmlrpclib
+from six.moves import xrange
+
from . import file_utils
from . import process_utils
from .type_utils import Error
diff --git a/py/utils/net_utils_unittest.py b/py/utils/net_utils_unittest.py
index a95d951..ddcddc2 100755
--- a/py/utils/net_utils_unittest.py
+++ b/py/utils/net_utils_unittest.py
@@ -15,6 +15,7 @@
import unittest
import mock
+from six.moves import xrange
import factory_common # pylint: disable=unused-import
from cros.factory.utils import net_utils
diff --git a/py/utils/process_utils.py b/py/utils/process_utils.py
index 3f6b8ca..90144d3 100644
--- a/py/utils/process_utils.py
+++ b/py/utils/process_utils.py
@@ -20,6 +20,8 @@
import traceback
from six import iteritems
+from six.moves import xrange
+
try:
PIPE = subprocess.PIPE
diff --git a/py/utils/pygpt.py b/py/utils/pygpt.py
index 2db8188..cd4c0b5 100755
--- a/py/utils/pygpt.py
+++ b/py/utils/pygpt.py
@@ -40,6 +40,8 @@
import uuid
from six import iteritems
+from six.moves import xrange
+
class StructError(Exception):
"""Exceptions in packing and unpacking from/to struct fields."""
diff --git a/py/utils/sync_utils.py b/py/utils/sync_utils.py
index 5ec2a5e..ed061c5 100644
--- a/py/utils/sync_utils.py
+++ b/py/utils/sync_utils.py
@@ -15,6 +15,8 @@
import threading
import time
+from six.moves import xrange
+
from . import thread_utils
from . import time_utils
from . import type_utils
diff --git a/py/utils/thread_utils_unittest.py b/py/utils/thread_utils_unittest.py
index d95a138..dd7e70d 100755
--- a/py/utils/thread_utils_unittest.py
+++ b/py/utils/thread_utils_unittest.py
@@ -7,6 +7,8 @@
import threading
import unittest
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.utils import thread_utils
diff --git a/py/utils/type_utils_unittest.py b/py/utils/type_utils_unittest.py
index bab269f..c69c62b 100755
--- a/py/utils/type_utils_unittest.py
+++ b/py/utils/type_utils_unittest.py
@@ -7,6 +7,8 @@
import unittest
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
from cros.factory.utils import type_utils
diff --git a/py/utils/watchdog_utils_manualtest.py b/py/utils/watchdog_utils_manualtest.py
index 8f5b9f4..46c67af 100755
--- a/py/utils/watchdog_utils_manualtest.py
+++ b/py/utils/watchdog_utils_manualtest.py
@@ -8,6 +8,8 @@
import logging
import unittest
+from six.moves import xrange
+
import factory_common # pylint: disable=unused-import
# Since this script would be run as main, we can't use relative import here.
from cros.factory.utils import watchdog_utils
