From 4ddf8ed08e7e3adc4188554e622937aeb20c5f97 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 7 Jul 2018 00:47:34 +0200 Subject: [PATCH] tests: make test_ceph_argparse.py pass on py3-only systems On systems that do not have Python 2 installed, this test fails to import StringIO. Fixes: http://tracker.ceph.com/issues/24816 Signed-off-by: Nathan Cutler (cherry picked from commit 5ed075d77f2be7aba6ae011b67a7cf9e3cd7d321) --- src/test/pybind/test_ceph_argparse.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index d1769f714891..55e04c231d7b 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -24,7 +24,10 @@ import os import re import sys import json -from StringIO import StringIO +try: + from StringIO import StringIO +except ImportError: + from io import StringIO def get_command_descriptions(what): CEPH_BIN = os.environ['CEPH_BIN'] -- 2.47.3