From 7d7b9f91982322c2d44a8ec848e6816e14c1db58 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 (cherry picked from commit 0510d47d47d32f627059a8728042d447d62e8d81) Conflicts: src/test/rgw/rgw_multi/zone_cloud.py - this file isn't a part of luminous --- src/test/rgw/rgw_multi/multisite.py | 5 +++-- src/test/rgw/rgw_multi/tests.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py index 58bd98224b14a..78e8a6b56e848 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 29dab8322f38a..5b4f0a0d3caf7 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 -- 2.47.3