]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/swift.py: s/StringIO/BytesIO/
authorKefu Chai <kchai@redhat.com>
Fri, 27 Mar 2020 04:33:01 +0000 (12:33 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 2 Jun 2020 02:32:23 +0000 (10:32 +0800)
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>
qa/tasks/swift.py

index bfd032c7572d0b3b64cbeb3bc56a53bd0a07384f..cc04e3495f472c80ce2f8a5e35df65d820f2e1ea 100644 (file)
@@ -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,