openstack
/
keystone
Code Issues Proposed changes

Replace xrange in for loop with range 

xrange is not supported in python 3, so replace it with six.moves.range

Closes-Bug: #1259978

Change-Id: I321380693d45f7d48f52da2d0f8e4c137763ab0c
This commit is contained in:
Wu Wenxiang 2013-12-11 23:48:47 +08:00
parent 576f5d99ea
commit 04b0c22c65
5 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/common/base64utils.py
View File

@ -44,6 +44,8 @@ import re
import string
import urllib
from six import moves
class InvalidBase64Error(ValueError):
pass
@ -361,7 +363,7 @@ def base64_wrap_iter(text, width=64):
"""
text = unicode(text)
for x in xrange(0, len(text), width):
for x in moves.range(0, len(text), width):
yield text[x:x + width]

3
keystone/common/utils.py
View File

@ -32,6 +32,7 @@ from keystone.common import config
from keystone.common import environment
from keystone import exception
from keystone.openstack.common import log as logging
from six import moves
CONF = config.CONF
@ -240,7 +241,7 @@ def auth_str_equal(provided, known):
result = 0
p_len = len(provided)
k_len = len(known)
for i in xrange(p_len):
for i in moves.range(p_len):
a = ord(provided[i]) if i < p_len else 0
b = ord(known[i]) if i < k_len else 0
result |= a ^ b

3
keystone/tests/fakeldap.py
View File

@ -31,6 +31,7 @@ import ldap
from keystone.common import utils
from keystone.openstack.common import log as logging
from six import moves
SCOPE_NAMES = {
@ -89,7 +90,7 @@ def _paren_groups(source):
count = 0
start = 0
result = []
for pos in xrange(len(source)):
for pos in moves.range(len(source)):
if source[pos] == '(':
if count == 0:
start = pos

3
keystone/tests/test_backend.py
View File

@ -25,6 +25,7 @@ from keystone import exception
from keystone.openstack.common import timeutils
from keystone import tests
from keystone.tests import default_fixtures
from six import moves
CONF = config.CONF
@ -3061,7 +3062,7 @@ class TokenTests(object):
def test_list_revoked_tokens_for_multiple_tokens(self):
self.check_list_revoked_tokens([self.delete_token()
for x in xrange(2)])
for x in moves.range(2)])
def test_flush_expired_token(self):
token_id = uuid.uuid4().hex

43
keystone/tests/test_pemutils.py
View File

@ -17,6 +17,7 @@
import base64
from keystone.common import pemutils
from keystone import tests
from six import moves
# List of 2-tuples, (pem_type, pem_header)
@ -24,7 +25,7 @@ headers = pemutils.PEM_TYPE_TO_HEADER.items()
def make_data(size, offset=0):
return ''.join([chr(x % 255) for x in xrange(offset, size + offset)])
return ''.join([chr(x % 255) for x in moves.range(offset, size + offset)])
def make_base64_from_data(data):
@ -33,7 +34,7 @@ def make_base64_from_data(data):
def wrap_base64(base64_text):
wrapped_text = '\n'.join([base64_text[x:x + 64]
for x in xrange(0, len(base64_text), 64)])
for x in moves.range(0, len(base64_text), 64)])
wrapped_text += '\n'
return wrapped_text
@ -115,13 +116,13 @@ class TestPEMParse(tests.TestCase):
count = len(headers)
pems = []
for i in xrange(count):
for i in moves.range(count):
pems.append(PEM(pem_type=headers[i][0],
pem_header=headers[i][1],
data_size=data_size + i,
data_offset=i))
for i in xrange(count):
for i in moves.range(count):
p = pems[i]
text = p.pem_text
@ -163,19 +164,19 @@ class TestPEMParse(tests.TestCase):
pems = []
text = ''
for i in xrange(count):
for i in moves.range(count):
pems.append(PEM(pem_type=headers[i][0],
pem_header=headers[i][1],
data_size=data_size + i,
data_offset=i))
for i in xrange(count):
for i in moves.range(count):
text += pems[i].pem_text
parse_results = pemutils.parse_pem(text)
self.assertEqual(len(parse_results), count)
for i in xrange(count):
for i in moves.range(count):
r = parse_results[i]
p = pems[i]
@ -193,16 +194,16 @@ class TestPEMParse(tests.TestCase):
pems = []
text = ''
for i in xrange(count):
for i in moves.range(count):
pems.append(PEM(pem_type=headers[i][0],
pem_header=headers[i][1],
data_size=data_size + i,
data_offset=i))
for i in xrange(count):
for i in moves.range(count):
text += pems[i].pem_text
for i in xrange(count):
for i in moves.range(count):
parse_results = pemutils.parse_pem(text, pem_type=headers[i][0])
self.assertEqual(len(parse_results), 1)
@ -223,13 +224,13 @@ class TestPEMParse(tests.TestCase):
pems = []
text = ''
for i in xrange(count):
for i in moves.range(count):
pems.append(PEM(pem_type=headers[i][0],
pem_header=headers[i][1],
data_size=data_size + i,
data_offset=i))
for i in xrange(count):
for i in moves.range(count):
text += 'bla bla\n'
text += 'yada yada yada\n'
text += pems[i].pem_text
@ -238,7 +239,7 @@ class TestPEMParse(tests.TestCase):
parse_results = pemutils.parse_pem(text)
self.assertEqual(len(parse_results), count)
for i in xrange(count):
for i in moves.range(count):
r = parse_results[i]
p = pems[i]
@ -272,13 +273,13 @@ class TestPEMParse(tests.TestCase):
count = len(headers)
pems = []
for i in xrange(count):
for i in moves.range(count):
pems.append(PEM(pem_type=headers[i][0],
pem_header=headers[i][1],
data_size=data_size + i,
data_offset=i))
for i in xrange(count):
for i in moves.range(count):
p = pems[i]
text = p.pem_text
@ -290,13 +291,13 @@ class TestPEMParse(tests.TestCase):
count = len(headers)
pems = []
for i in xrange(count):
for i in moves.range(count):
pems.append(PEM(pem_type=headers[i][0],
pem_header=headers[i][1],
data_size=data_size + i,
data_offset=i))
for i in xrange(count):
for i in moves.range(count):
p = pems[i]
text = p.pem_text
self.assertTrue(pemutils.is_pem(text, pem_type=p.pem_type))
@ -308,13 +309,13 @@ class TestPEMParse(tests.TestCase):
count = len(headers)
pems = []
for i in xrange(count):
for i in moves.range(count):
pems.append(PEM(pem_type=headers[i][0],
pem_header=headers[i][1],
data_size=data_size + i,
data_offset=i))
for i in xrange(count):
for i in moves.range(count):
p = pems[i]
pem = pemutils.base64_to_pem(p.base64_text, p.pem_type)
self.assertEqual(pemutils.get_pem_data(pem, p.pem_type), p.data)
@ -324,13 +325,13 @@ class TestPEMParse(tests.TestCase):
count = len(headers)
pems = []
for i in xrange(count):
for i in moves.range(count):
pems.append(PEM(pem_type=headers[i][0],
pem_header=headers[i][1],
data_size=data_size + i,
data_offset=i))
for i in xrange(count):
for i in moves.range(count):
p = pems[i]
pem = pemutils.binary_to_pem(p.data, p.pem_type)
self.assertEqual(pemutils.get_pem_data(pem, p.pem_type), p.data)