From 85c750be26539f8e16458a49a52c057297bba8bb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 28 Oct 2019 12:17:07 -0500 Subject: [PATCH] ceph-daemon: try py2 import before py3 See https://github.com/ceph/ceph-medic/commit/f499a89b15b72a5bb842e1ebbc7cafc4daf58c1c Signed-off-by: Sage Weil --- src/ceph-daemon | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ceph-daemon b/src/ceph-daemon index 375849a7bec6..cf1402e180b3 100755 --- a/src/ceph-daemon +++ b/src/ceph-daemon @@ -32,14 +32,14 @@ You can invoke ceph-daemon in two ways: import argparse try: - from configparser import ConfigParser # py3 -except ImportError: from ConfigParser import ConfigParser # py2 +except ImportError: + from configparser import ConfigParser # py3 import fcntl try: - from io import StringIO # py3 -except: from StringIO import StringIO # py2 +except: + from io import StringIO # py3 import json import logging import os -- 2.47.3