qa/tasks/s3tests: drop py2 support

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

diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index c0266b6d2f6c2ca570672e4483e3bf3ff835325e..0ebea117371a67bf469e7b26508c90d0836692d1 100644 (file)
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -8,7 +8,6 @@ import contextlib
 import logging
 import os
 import random
-import six
 import string
 
 from teuthology import misc as teuthology
@@ -82,11 +81,11 @@ def _config_user(s3tests_conf, section, user):
     s3tests_conf[section].setdefault('access_key',
         ''.join(random.choice(string.ascii_uppercase) for i in range(20)))
     s3tests_conf[section].setdefault('secret_key',
-        six.ensure_str(base64.b64encode(os.urandom(40))))
+        base64.b64encode(os.urandom(40)).decode())
     s3tests_conf[section].setdefault('totp_serial',
         ''.join(random.choice(string.digits) for i in range(10)))
     s3tests_conf[section].setdefault('totp_seed',
-        six.ensure_str(base64.b32encode(os.urandom(40))))
+        base64.b32encode(os.urandom(40)).decode())
     s3tests_conf[section].setdefault('totp_seconds', '5')
 
 
@@ -245,15 +244,15 @@ def configure(ctx, config):
     log.info('Configuring boto...')
     boto_src = os.path.join(os.path.dirname(__file__), 'boto.cfg.template')
     for client, properties in config['clients'].items():
-        with open(boto_src, 'rb') as f:
+        with open(boto_src) as f:
             (remote,) = ctx.cluster.only(client).remotes.keys()
-            conf = six.ensure_str(f.read()).format(
+            conf = f.read().format(
                 idle_timeout=config.get('idle_timeout', 30)
                 )
             teuthology.write_file(
                 remote=remote,
                 path='{tdir}/boto.cfg'.format(tdir=testdir),
-                data=six.ensure_binary(conf),
+                data=conf.encode(),
                 )
 
     try: