diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-09 19:37:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-09 19:37:48 +0000 |
| commit | a48c05b90a376ce33e2f0a2d321b8c851a6ef0b0 (patch) | |
| tree | da430ebd4695049d4fdc06b8892f7103d6b0f5cc /openstackclient/tests/unit/object/v1 | |
| parent | 960004dcc733e88841d372e160b9e43669796c80 (diff) | |
| parent | c2df9215e19752714e83fcad82c8ae3708f85d7a (diff) | |
| download | python-openstackclient-a48c05b90a376ce33e2f0a2d321b8c851a6ef0b0.tar.gz | |
Merge "Remove usage of six"
Diffstat (limited to 'openstackclient/tests/unit/object/v1')
| -rw-r--r-- | openstackclient/tests/unit/object/v1/fakes.py | 3 | ||||
| -rw-r--r-- | openstackclient/tests/unit/object/v1/test_object_all.py | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/openstackclient/tests/unit/object/v1/fakes.py b/openstackclient/tests/unit/object/v1/fakes.py index 0ed791a5..1808d5b7 100644 --- a/openstackclient/tests/unit/object/v1/fakes.py +++ b/openstackclient/tests/unit/object/v1/fakes.py @@ -14,7 +14,6 @@ # from keystoneauth1 import session -import six from openstackclient.api import object_store_v1 as object_store from openstackclient.tests.unit import utils @@ -68,7 +67,7 @@ OBJECT = { 'last_modified': object_modified_1, } -object_1_content = six.b('object 1 content') +object_1_content = b'object 1 content' OBJECT_2 = { 'name': object_name_2, diff --git a/openstackclient/tests/unit/object/v1/test_object_all.py b/openstackclient/tests/unit/object/v1/test_object_all.py index dd587142..7e88409f 100644 --- a/openstackclient/tests/unit/object/v1/test_object_all.py +++ b/openstackclient/tests/unit/object/v1/test_object_all.py @@ -12,11 +12,11 @@ # import copy +import io from unittest import mock from osc_lib import exceptions from requests_mock.contrib import fixture -import six from openstackclient.object.v1 import object as object_cmds from openstackclient.tests.unit.object.v1 import fakes as object_fakes @@ -241,9 +241,9 @@ class TestObjectSave(TestObjectAll): parsed_args = self.check_parser(self.cmd, arglist, verifylist) - class FakeStdout(six.BytesIO): + class FakeStdout(io.BytesIO): def __init__(self): - six.BytesIO.__init__(self) + io.BytesIO.__init__(self) self.context_manager_calls = [] def __enter__(self): |