From 0510d47d47d32f627059a8728042d447d62e8d81 Mon Sep 17 00:00:00 2001 From: Abhishek Lekshmanan Date: Tue, 20 Nov 2018 19:29:42 +0100 Subject: [PATCH] tests: rgw: test_multi: python 2-3 compatibility Adding the usual six libraries for python3 compat Signed-off-by: Abhishek Lekshmanan --- src/test/rgw/rgw_multi/multisite.py | 5 +++-- src/test/rgw/rgw_multi/tests.py | 2 +- src/test/rgw/rgw_multi/zone_cloud.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py index 58bd98224b14..78e8a6b56e84 100644 --- a/src/test/rgw/rgw_multi/multisite.py +++ b/src/test/rgw/rgw_multi/multisite.py @@ -1,8 +1,9 @@ from abc import ABCMeta, abstractmethod -from cStringIO import StringIO +from six import StringIO + import json -from conn import get_gateway_connection +from .conn import get_gateway_connection class Cluster: """ interface to run commands against a distinct ceph cluster """ diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index 7c9b7b7f3f00..779b9524a99e 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -11,7 +11,7 @@ try: except ImportError: from itertools import zip_longest from itertools import combinations -from cStringIO import StringIO +from six import StringIO import boto import boto.s3.connection diff --git a/src/test/rgw/rgw_multi/zone_cloud.py b/src/test/rgw/rgw_multi/zone_cloud.py index 7debba092e2c..4e5eefb8c11b 100644 --- a/src/test/rgw/rgw_multi/zone_cloud.py +++ b/src/test/rgw/rgw_multi/zone_cloud.py @@ -16,7 +16,7 @@ try: except ImportError: from itertools import zip_longest -from urlparse import urlparse +from six.moves.urllib.parse import urlparse from .multisite import * from .tools import * -- 2.47.3