From a045778d5b5bce829426aacffc8eff510ea3db0d Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 28 Jun 2020 19:59:50 +0800 Subject: [PATCH] qa/tasks/cephfs: drop six dependency Signed-off-by: Kefu Chai --- qa/tasks/cephfs/test_forward_scrub.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephfs/test_forward_scrub.py b/qa/tasks/cephfs/test_forward_scrub.py index 7ed8564d228..9ca3c4de790 100644 --- a/qa/tasks/cephfs/test_forward_scrub.py +++ b/qa/tasks/cephfs/test_forward_scrub.py @@ -7,10 +7,8 @@ This is *not* the real testing for forward scrub, which will need to test how the functionality responds to damaged metadata. """ -import json - import logging -import six +import json from collections import namedtuple from io import BytesIO @@ -37,7 +35,7 @@ class TestForwardScrub(CephFSTestCase): output = self.fs.rados(["getxattr", obj, attr], pool=pool, stdout_data=BytesIO()) strlen = struct.unpack('i', output[0:4])[0] - return six.ensure_str(output[4:(4 + strlen)], encoding='ascii') + return output[4:(4 + strlen)].decode(encoding='ascii') def _get_paths_to_ino(self): inos = {} -- 2.39.5