From 29ac8118a338672bec5444c9bb1c633f27d0f66c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 28 Jun 2020 19:44:26 +0800 Subject: [PATCH] qa/tasks/rbd: drop py2 support Signed-off-by: Kefu Chai --- qa/tasks/rbd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/tasks/rbd.py b/qa/tasks/rbd.py index 6d066a6f23c2b..7e1128007c520 100644 --- a/qa/tasks/rbd.py +++ b/qa/tasks/rbd.py @@ -7,7 +7,7 @@ import os import tempfile import sys -from io import BytesIO +from io import StringIO from teuthology.orchestra import run from teuthology import misc as teuthology from teuthology import contextutil @@ -303,12 +303,12 @@ def canonical_path(ctx, role, path): representing the given role. A canonical path contains no . or .. components, and includes no symbolic links. """ - version_fp = BytesIO() + version_fp = StringIO() ctx.cluster.only(role).run( args=[ 'readlink', '-f', path ], stdout=version_fp, ) - canonical_path = six.ensure_str(version_fp.getvalue()).rstrip('\n') + canonical_path = version_fp.getvalue().rstrip('\n') version_fp.close() return canonical_path -- 2.39.5