]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
teuthology/task: drop six.ensure_str()
authorKefu Chai <kchai@redhat.com>
Wed, 17 Jun 2020 09:21:17 +0000 (17:21 +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/task/internal/__init__.py

index 3b552127d2a64b68e5dfc003450eda77fad4672f..640008e7e3c2f90fd1c236b3344bf1954009682a 100644 (file)
@@ -8,7 +8,6 @@ import logging
 import os
 import time
 import yaml
-import six
 import subprocess
 
 import teuthology.lock.ops
@@ -306,12 +305,12 @@ def fetch_binaries_for_coredumps(path, remote):
             dump_path = os.path.join(coredump_path, dump)
             dump_info = subprocess.Popen(['file', dump_path],
                                          stdout=subprocess.PIPE)
-            dump_out = dump_info.communicate()[0]
+            dump_out = dump_info.communicate()[0].decode()
 
             # Parse file output to get program, Example output:
             # 1422917770.7450.core: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style, \
             # from 'radosgw --rgw-socket-path /home/ubuntu/cephtest/apache/tmp.client.0/fastcgi_soc'
-            dump_program = six.ensure_str(dump_out).split("from '")[1].split(' ')[0]
+            dump_program = dump_out.split("from '")[1].split(' ')[0]
 
             # Find path on remote server:
             remote_path = remote.sh(['which', dump_program]).rstrip()