From 564b9f0afa9ac9a50e7f69d3236cda59f60e323f Mon Sep 17 00:00:00 2001 From: LiuNanke Date: Fri, 15 Jan 2016 00:59:32 +0800 Subject: [PATCH] py3: Replaces xrange() with range() Since xrange has been removed in Python 3, this patch let's replace xrange() with using the built-in range() function.range(). Change-Id: Ia028c25d6ecaea64beec0e61b15d74f5ae25e74f --- trove/tests/api/limits.py | 4 ++-- trove/tests/unittests/api/common/test_limits.py | 2 +- trove/tests/unittests/backup/test_backup_models.py | 2 +- trove/tests/unittests/backup/test_backupagent.py | 2 +- .../unittests/guestagent/test_agent_heartbeats_models.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/trove/tests/api/limits.py b/trove/tests/api/limits.py index c23e4d4a24..f4e9bb7dc9 100644 --- a/trove/tests/api/limits.py +++ b/trove/tests/api/limits.py @@ -122,7 +122,7 @@ class Limits(object): """Test_limits_get_remaining.""" limits = () - for i in xrange(5): + for i in range(5): limits = self.rd_client.limits.list() d = self._get_limits_as_dict(limits) @@ -148,7 +148,7 @@ class Limits(object): get = None encountered = False - for i in xrange(DEFAULT_RATE + 50): + for i in range(DEFAULT_RATE + 50): try: limits = rd_client.limits.list() d = self._get_limits_as_dict(limits) diff --git a/trove/tests/unittests/api/common/test_limits.py b/trove/tests/unittests/api/common/test_limits.py index 4aa47fd644..bbb72c915a 100644 --- a/trove/tests/unittests/api/common/test_limits.py +++ b/trove/tests/unittests/api/common/test_limits.py @@ -358,7 +358,7 @@ class LimiterTest(BaseLimitTestSuite): def _check(self, num, verb, url, username=None): """Check and yield results from checks.""" - for x in xrange(num): + for x in range(num): yield self.limiter.check_for_delay(verb, url, username)[0] def _check_sum(self, num, verb, url, username=None): diff --git a/trove/tests/unittests/backup/test_backup_models.py b/trove/tests/unittests/backup/test_backup_models.py index d3bdacff39..1851f793a6 100644 --- a/trove/tests/unittests/backup/test_backup_models.py +++ b/trove/tests/unittests/backup/test_backup_models.py @@ -372,7 +372,7 @@ class PaginationTests(trove_testtools.TestCase): 'size': 2.0, 'deleted': False } - for backup in xrange(50): + for backup in range(50): bkup_info.update({'name': 'Backup-%s' % backup}) models.DBBackup.create(**bkup_info) diff --git a/trove/tests/unittests/backup/test_backupagent.py b/trove/tests/unittests/backup/test_backupagent.py index 9d27bc8bfe..8c19d0bafe 100644 --- a/trove/tests/unittests/backup/test_backupagent.py +++ b/trove/tests/unittests/backup/test_backupagent.py @@ -43,7 +43,7 @@ def create_fake_data(): from random import choice from string import ascii_letters - return ''.join([choice(ascii_letters) for _ in xrange(1024)]) + return ''.join([choice(ascii_letters) for _ in range(1024)]) class MockBackup(BackupRunner): diff --git a/trove/tests/unittests/guestagent/test_agent_heartbeats_models.py b/trove/tests/unittests/guestagent/test_agent_heartbeats_models.py index a432edd522..3d13e54bd0 100644 --- a/trove/tests/unittests/guestagent/test_agent_heartbeats_models.py +++ b/trove/tests/unittests/guestagent/test_agent_heartbeats_models.py @@ -128,7 +128,7 @@ class AgentHeartBeatTest(trove_testtools.TestCase): # create some unique records with the same version version = str(uuid.uuid4()) - for x in xrange(5): + for x in range(5): instance_id = str(uuid.uuid4()) heartbeat = AgentHeartBeat.create( instance_id=instance_id,