From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Fri, 21 Feb 2020 18:13:16 +0000 (+0100)
Subject: qa/tasks/radosgw_admin: get rid of cStringIO for py3
X-Git-Tag: v14.2.10~17^2~102
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db3ab1f9b72426c41a72bc9f83c17e3dc9363dc1;p=ceph.git

qa/tasks/radosgw_admin: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit 0a224991cfb4cb9683e27c9afe6b922415a6f8ed)
---

diff --git a/qa/tasks/radosgw_admin.py b/qa/tasks/radosgw_admin.py
index 8fe54df4c38c..8c6e952080ca 100644
--- a/qa/tasks/radosgw_admin.py
+++ b/qa/tasks/radosgw_admin.py
@@ -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'])