From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Tue, 20 Nov 2018 18:29:42 +0000 (+0100)
Subject: tests: rgw: test_multi: python 2-3 compatibility
X-Git-Tag: v14.1.0~777^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25160%2Fhead;p=ceph.git

tests: rgw: test_multi: python 2-3 compatibility

Adding the usual six libraries for python3 compat

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py
index 58bd98224b1..78e8a6b56e8 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 7c9b7b7f3f0..779b9524a99 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 7debba092e2..4e5eefb8c11 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 *