tests: rgw: test_multi: python 2-3 compatibility

Adding the usual six libraries for python3 compat

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 0510d47d47d32f627059a8728042d447d62e8d81)

Conflicts:
 src/test/rgw/rgw_multi/zone_cloud.py
- this file isn't a part of luminous

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 29dab8322f38ae92d8a4e73fcaa9ae90ce42349e..5b4f0a0d3caf776365bdce620337ac2e7338bb8a 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