openstack/python-swiftclient
Code Issues Proposed changes

Merge "Python 3: Replace iter.next() with six.next(iter)"

Browse Source
This commit is contained in:
Jenkins 2014-03-28 09:59:03 +00:00 committed by Gerrit Code Review
commit 7dcefe1b64
1 changed files with 4 additions and 4 deletions

8
tests/utils.py

@ -92,7 +92,7 @@ def fake_http_connect(*code_iter, **kwargs):
if not self.timestamp: if not self.timestamp:
del headers['x-timestamp'] del headers['x-timestamp']
try: try:
if container_ts_iter.next() is False: if next(container_ts_iter) is False:
headers['x-container-timestamp'] = '1' headers['x-container-timestamp'] = '1'
except StopIteration: except StopIteration:
pass pass
@ -141,9 +141,9 @@ def fake_http_connect(*code_iter, **kwargs):
kwargs['give_content_type']('') kwargs['give_content_type']('')
if 'give_connect' in kwargs: if 'give_connect' in kwargs:
kwargs['give_connect'](*args, **ckwargs) kwargs['give_connect'](*args, **ckwargs)
status = code_iter.next() status = next(code_iter)
etag = etag_iter.next() etag = next(etag_iter)
timestamp = timestamps_iter.next() timestamp = next(timestamps_iter)
if status <= 0: if status <= 0:
raise RequestException() raise RequestException()
fake_conn = FakeConn(status, etag, body=kwargs.get('body', ''), fake_conn = FakeConn(status, etag, body=kwargs.get('body', ''),