]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/radosgw_admin: get rid of cStringIO for py3
authorKyr Shatskyy <kyrylo.shatskyy@suse.com>
Fri, 21 Feb 2020 18:13:16 +0000 (19:13 +0100)
committerKefu Chai <kchai@redhat.com>
Tue, 2 Jun 2020 02:32:23 +0000 (10:32 +0800)
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit 0a224991cfb4cb9683e27c9afe6b922415a6f8ed)

qa/tasks/radosgw_admin.py

index 8fe54df4c38cb58217ceed0ca7af8501d6ae906a..8c6e952080ca8517d1b197fc7dd5f5a79fd786b4 100644 (file)
@@ -17,8 +17,9 @@ import datetime
 from six.moves import queue
 
 import sys
+import six
 
-from cStringIO import StringIO
+from io import BytesIO
 
 import boto.exception
 import boto.s3.connection
@@ -900,7 +901,7 @@ def task(ctx, config):
     out['placement_pools'].append(rule)
 
     (err, out) = rgwadmin(ctx, client, ['zone', 'set'],
-        stdin=StringIO(json.dumps(out)),
+        stdin=BytesIO(six.ensure_binary(json.dumps(out))),
         check_status=True)
 
     (err, out) = rgwadmin(ctx, client, ['zone', 'get'])