diff options
Diffstat (limited to 'functionaltests')
| -rw-r--r-- | functionaltests/cli/v1/behaviors/base_behaviors.py | 6 | ||||
| -rw-r--r-- | functionaltests/utils.py | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/functionaltests/cli/v1/behaviors/base_behaviors.py b/functionaltests/cli/v1/behaviors/base_behaviors.py index 3420cee..aef9831 100644 --- a/functionaltests/cli/v1/behaviors/base_behaviors.py +++ b/functionaltests/cli/v1/behaviors/base_behaviors.py @@ -13,9 +13,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ +import io import logging import re -import six from barbicanclient import barbican from functionaltests.common import config @@ -84,8 +84,8 @@ class BaseBehaviors(object): """ try: - self.cmdline_client.stdout = six.StringIO() - self.cmdline_client.stderr = six.StringIO() + self.cmdline_client.stdout = io.StringIO() + self.cmdline_client.stderr = io.StringIO() self.cmdline_client.run(argv) except SystemExit: pass diff --git a/functionaltests/utils.py b/functionaltests/utils.py index 367dee0..5c5b51a 100644 --- a/functionaltests/utils.py +++ b/functionaltests/utils.py @@ -19,8 +19,7 @@ import time import types import oslotest.base as oslotest -import six -import six.moves.urllib.parse as urlparse +import urllib.parse as urlparse class BaseTestCase(oslotest.BaseTestCase): @@ -43,10 +42,10 @@ def construct_new_test_function(original_func, name, build_params): :return: A new function object """ new_func = types.FunctionType( - six.get_function_code(original_func), - six.get_function_globals(original_func), + original_func.__code__, + original_func.__globals__, name=name, - argdefs=six.get_function_defaults(original_func) + argdefs=original_func.__defaults__ ) # Support either an arg list or kwarg dict for our data |