]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
teuthology/kill: drop six.ensure_str
authorKefu Chai <kchai@redhat.com>
Wed, 17 Jun 2020 09:36:59 +0000 (17:36 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 17 Jun 2020 14:19:20 +0000 (22:19 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
teuthology/kill.py

index f61e6a150b985249dadc86c3efda56cb5f38608c..d6ec66b55928ef54403c0276b3c1854c6cf020cd 100755 (executable)
@@ -8,7 +8,6 @@ import tempfile
 import logging
 import getpass
 
-from six import ensure_str
 
 from teuthology import beanstalk
 from teuthology import report
@@ -240,9 +239,9 @@ def nuke_targets(targets_dict, owner):
         nuke_args,
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT)
-    for line in iter(proc.stdout.readline, b''):
+    for line in proc.stdout:
         line = line.replace(b'\r', b'').replace(b'\n', b'')
-        log.info(ensure_str(line))
+        log.info(line.decode())
         sys.stdout.flush()
 
     os.unlink(target_file.name)