From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Mar 2020 04:33:01 +0000 (+0800)
Subject: qa/tasks/swift.py: s/StringIO/BytesIO/
X-Git-Tag: v14.2.10~17^2~101
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c6ea840ceef4c63c504d82249ab2f62c4fc69da;p=ceph.git

qa/tasks/swift.py: s/StringIO/BytesIO/

cStringIO is not offered by python3, so avoid using using this module.

this file does not exist in master anymore, so this change is not
cherry-picked from master.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/tasks/swift.py b/qa/tasks/swift.py
index bfd032c7572d..cc04e3495f47 100644
--- a/qa/tasks/swift.py
+++ b/qa/tasks/swift.py
@@ -1,7 +1,7 @@
 """
 Test Swift API
 """
-from cStringIO import StringIO
+from io import BytesIO
 from configobj import ConfigObj
 import base64
 import contextlib
@@ -121,7 +121,7 @@ def configure(ctx, config):
     assert isinstance(config, dict)
     log.info('Configuring testswift...')
     testdir = teuthology.get_testdir(ctx)
-    for client, testswift_conf in config.iteritems():
+    for client, testswift_conf in config.items():
         (remote,) = ctx.cluster.only(client).remotes.keys()
         remote.run(
             args=[
@@ -131,7 +131,7 @@ def configure(ctx, config):
                 './bootstrap',
                 ],
             )
-        conf_fp = StringIO()
+        conf_fp = BytesIO()
         testswift_conf.write(conf_fp)
         teuthology.write_file(
             remote=remote,