openstack/python-glanceclient
Code Issues Proposed changes

Merge "Downloading image with --progress fails for python3"

Browse Source
This commit is contained in:
Jenkins
2017-05-29 11:54:55 +00:00
committed by Gerrit Code Review
parent f7598479d1 bb2a5e946f
commit 3338ed91d4
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glanceclient/common/utils.py
View File

@@ -471,6 +471,9 @@ class IterableWithLength(object):
def next(self): def next(self):
return next(self.iterable) return next(self.iterable)
# In Python 3, __next__() has replaced next().
__next__ = next
def __len__(self): def __len__(self):
return self.length return self.length

6
glanceclient/tests/unit/test_progressbar.py
View File

@@ -19,6 +19,7 @@ import six
import testtools import testtools
from glanceclient.common import progressbar from glanceclient.common import progressbar
from glanceclient.common import utils
from glanceclient.tests import utils as test_utils from glanceclient.tests import utils as test_utils
@@ -26,12 +27,13 @@ class TestProgressBarWrapper(testtools.TestCase):
def test_iter_iterator_display_progress_bar(self): def test_iter_iterator_display_progress_bar(self):
size = 100 size = 100
iterator = iter('X' * 100) iterator_with_len = utils.IterableWithLength(iter('X' * 100), size)
saved_stdout = sys.stdout saved_stdout = sys.stdout
try: try:
sys.stdout = output = test_utils.FakeTTYStdout() sys.stdout = output = test_utils.FakeTTYStdout()
# Consume iterator. # Consume iterator.
data = list(progressbar.VerboseIteratorWrapper(iterator, size)) data = list(progressbar.VerboseIteratorWrapper(iterator_with_len,
size))
self.assertEqual(['X'] * 100, data) self.assertEqual(['X'] * 100, data)
self.assertEqual( self.assertEqual(
'[%s>] 100%%\n' % ('=' * 29), '[%s>] 100%%\n' % ('=' * 29),