openstack/python-openstackclient
Code Issues Proposed changes

Remove remnants of 'six'

Browse Source 
Just one entry left. Remove it.

Change-Id: Ia12173ecb7f3fed4a1195a46ebf9b096d917b3b6
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2021-10-08 18:20:31 +01:00
parent 30612bf622
commit 728401bbd7
2 changed files with 5 additions and 7 deletions
lower-constraints.txt
openstackclient/tests/unit/common
test_progressbar.py

1
lower-constraints.txt

@ -81,7 +81,6 @@ requestsexceptions==1.2.0
rfc3986==0.3.1 rfc3986==0.3.1
Routes==2.3.1 Routes==2.3.1
simplejson==3.5.1 simplejson==3.5.1
six==1.15.0
statsd==3.2.1 statsd==3.2.1
stestr==1.0.0 stestr==1.0.0
stevedore==2.0.1 stevedore==2.0.1

11
openstackclient/tests/unit/common/test_progressbar.py

@ -11,10 +11,9 @@
# under the License. # under the License.
# #
import io
import sys import sys
import six
from openstackclient.common import progressbar from openstackclient.common import progressbar
from openstackclient.tests.unit import utils from openstackclient.tests.unit import utils
@ -23,7 +22,7 @@ class TestProgressBarWrapper(utils.TestCase):
def test_iter_file_display_progress_bar(self): def test_iter_file_display_progress_bar(self):
size = 98304 size = 98304
file_obj = six.StringIO('X' * size) file_obj = io.StringIO('X' * size)
saved_stdout = sys.stdout saved_stdout = sys.stdout
try: try:
sys.stdout = output = FakeTTYStdout() sys.stdout = output = FakeTTYStdout()
@ -41,7 +40,7 @@ class TestProgressBarWrapper(utils.TestCase):
def test_iter_file_no_tty(self): def test_iter_file_no_tty(self):
size = 98304 size = 98304
file_obj = six.StringIO('X' * size) file_obj = io.StringIO('X' * size)
saved_stdout = sys.stdout saved_stdout = sys.stdout
try: try:
sys.stdout = output = FakeNoTTYStdout() sys.stdout = output = FakeNoTTYStdout()
@ -56,7 +55,7 @@ class TestProgressBarWrapper(utils.TestCase):
sys.stdout = saved_stdout sys.stdout = saved_stdout
class FakeTTYStdout(six.StringIO): class FakeTTYStdout(io.StringIO):
"""A Fake stdout that try to emulate a TTY device as much as possible.""" """A Fake stdout that try to emulate a TTY device as much as possible."""
def isatty(self): def isatty(self):
@ -67,7 +66,7 @@ class FakeTTYStdout(six.StringIO):
if data.startswith('\r'): if data.startswith('\r'):
self.seek(0) self.seek(0)
data = data[1:] data = data[1:]
return six.StringIO.write(self, data) return io.StringIO.write(self, data)
class FakeNoTTYStdout(FakeTTYStdout): class FakeNoTTYStdout(FakeTTYStdout):