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 58bd98224b14a734f7ea20bc55d755be2fd79a80..78e8a6b56e8481616f8815acbd0ff1da22a95120 100644 (file)
--- 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 7c9b7b7f3f001d7941143a2521b50ff1a1317de9..779b9524a99e48a99878779192a223b9ac49785e 100644 (file)
--- 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 7debba092e2cd5bffa0d1f5ca1cd0c047c79d4e8..4e5eefb8c11b5b8a11d223967f419eebc69a5f17 100644 (file)
--- 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 *