Skip to content

Commit 728401b

Browse files
committed
Remove remnants of 'six'
Just one entry left. Remove it. Change-Id: Ia12173ecb7f3fed4a1195a46ebf9b096d917b3b6 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
1 parent 30612bf commit 728401b

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

lower-constraints.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ requestsexceptions==1.2.0
8181
rfc3986==0.3.1
8282
Routes==2.3.1
8383
simplejson==3.5.1
84-
six==1.15.0
8584
statsd==3.2.1
8685
stestr==1.0.0
8786
stevedore==2.0.1

openstackclient/tests/unit/common/test_progressbar.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
# under the License.
1212
#
1313

14+
import io
1415
import sys
1516

16-
import six
17-
1817
from openstackclient.common import progressbar
1918
from openstackclient.tests.unit import utils
2019

@@ -23,7 +22,7 @@ class TestProgressBarWrapper(utils.TestCase):
2322

2423
def test_iter_file_display_progress_bar(self):
2524
size = 98304
26-
file_obj = six.StringIO('X' * size)
25+
file_obj = io.StringIO('X' * size)
2726
saved_stdout = sys.stdout
2827
try:
2928
sys.stdout = output = FakeTTYStdout()
@@ -41,7 +40,7 @@ def test_iter_file_display_progress_bar(self):
4140

4241
def test_iter_file_no_tty(self):
4342
size = 98304
44-
file_obj = six.StringIO('X' * size)
43+
file_obj = io.StringIO('X' * size)
4544
saved_stdout = sys.stdout
4645
try:
4746
sys.stdout = output = FakeNoTTYStdout()
@@ -56,7 +55,7 @@ def test_iter_file_no_tty(self):
5655
sys.stdout = saved_stdout
5756

5857

59-
class FakeTTYStdout(six.StringIO):
58+
class FakeTTYStdout(io.StringIO):
6059
"""A Fake stdout that try to emulate a TTY device as much as possible."""
6160

6261
def isatty(self):
@@ -67,7 +66,7 @@ def write(self, data):
6766
if data.startswith('\r'):
6867
self.seek(0)
6968
data = data[1:]
70-
return six.StringIO.write(self, data)
69+
return io.StringIO.write(self, data)
7170

7271

7372
class FakeNoTTYStdout(FakeTTYStdout):

0 commit comments

Comments
 (0)