From de852b24d97b58d8678b53e7e2d4d4fb2b87318e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 17 Jun 2020 17:36:59 +0800 Subject: [PATCH] teuthology/kill: drop six.ensure_str Signed-off-by: Kefu Chai --- teuthology/kill.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/teuthology/kill.py b/teuthology/kill.py index f61e6a150..d6ec66b55 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) -- 2.47.3