From: Kefu Chai <kchai@redhat.com>
Date: Wed, 17 Jun 2020 09:36:59 +0000 (+0800)
Subject: teuthology/kill: drop six.ensure_str
X-Git-Tag: 1.1.0~86^2~14
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=de852b24d97b58d8678b53e7e2d4d4fb2b87318e;p=teuthology.git

teuthology/kill: drop six.ensure_str

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

diff --git a/teuthology/kill.py b/teuthology/kill.py
index f61e6a150b..d6ec66b559 100755
--- a/teuthology/kill.py
+++ b/teuthology/kill.py
@@ -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)