summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-12-01 03:44:20 +0000
committerGerrit Code Review <review@openstack.org>2013-12-01 03:44:20 +0000
commit607645a55073fd4eb7c4d9c1635051736dbaf350 (patch)
treed98528cff1698f96f38fe482b2d69ccaf2df11e9
parent01982dfbdd790f1d4d6df4883c6c4ef890dd38f7 (diff)
parent81107d3beaaeea23436e970121eb63d72d1fee54 (diff)
downloadpython-neutronclient-607645a55073fd4eb7c4d9c1635051736dbaf350.tar.gz
Merge "Convert xrange to range"
-rw-r--r--neutronclient/neutron/v2_0/network.py2
-rw-r--r--neutronclient/tests/unit/test_cli20.py2
-rw-r--r--neutronclient/tests/unit/test_utils.py2
-rw-r--r--neutronclient/v2_0/client.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/neutronclient/neutron/v2_0/network.py b/neutronclient/neutron/v2_0/network.py
index 40be9b3..758a2c5 100644
--- a/neutronclient/neutron/v2_0/network.py
+++ b/neutronclient/neutron/v2_0/network.py
@@ -72,7 +72,7 @@ class ListNetwork(neutronV20.ListCommand):
uri_len_exc.excess)
chunk_size = max_size / self.subnet_id_filter_len
subnets = []
- for i in xrange(0, subnet_count, chunk_size):
+ for i in range(0, subnet_count, chunk_size):
subnets.extend(
_get_subnet_list(subnet_ids[i: i + chunk_size]))
diff --git a/neutronclient/tests/unit/test_cli20.py b/neutronclient/tests/unit/test_cli20.py
index 7f0dc5c..2153c53 100644
--- a/neutronclient/tests/unit/test_cli20.py
+++ b/neutronclient/tests/unit/test_cli20.py
@@ -207,7 +207,7 @@ class CLITestV20Base(testtools.TestCase):
body[resource].update(extra_body)
body[resource].update(kwargs)
- for i in xrange(len(position_names)):
+ for i in range(len(position_names)):
body[resource].update({position_names[i]: position_values[i]})
ress = {resource:
{self.id_field: myid}, }
diff --git a/neutronclient/tests/unit/test_utils.py b/neutronclient/tests/unit/test_utils.py
index e9b4d42..69facdc 100644
--- a/neutronclient/tests/unit/test_utils.py
+++ b/neutronclient/tests/unit/test_utils.py
@@ -147,7 +147,7 @@ class ToPrimitiveTestCase(testtools.TestCase):
'1920-02-03 04:05:06.000007')
def test_iter(self):
- x = xrange(1, 6)
+ x = range(1, 6)
self.assertEqual(utils.to_primitive(x), [1, 2, 3, 4, 5])
def test_iteritems(self):
diff --git a/neutronclient/v2_0/client.py b/neutronclient/v2_0/client.py
index fa70abb..eeab355 100644
--- a/neutronclient/v2_0/client.py
+++ b/neutronclient/v2_0/client.py
@@ -1216,7 +1216,7 @@ class Client(object):
:raises: ConnectionFailed if the maximum # of retries is exceeded
"""
max_attempts = self.retries + 1
- for i in xrange(max_attempts):
+ for i in range(max_attempts):
try:
return self.do_request(method, action, body=body,
headers=headers, params=params)