From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 12 Oct 2018 09:14:31 +0000 (+0200)
Subject: pybind/mgr: Fix Python 3 imports in diskprediction & insights
X-Git-Tag: v14.0.1~17^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c06fae6391b96de4ea2cd419ed446c948bfc66c0;p=ceph.git

pybind/mgr: Fix Python 3 imports in diskprediction & insights

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/diskprediction/common/__init__.py b/src/pybind/mgr/diskprediction/common/__init__.py
index e567e4f72d922..cbc3c30ebf687 100644
--- a/src/pybind/mgr/diskprediction/common/__init__.py
+++ b/src/pybind/mgr/diskprediction/common/__init__.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import errno
 from functools import wraps
-from httplib import BAD_REQUEST
+from six.moves.http_client import BAD_REQUEST
 import os
 import signal
 
diff --git a/src/pybind/mgr/diskprediction/common/grpcclient.py b/src/pybind/mgr/diskprediction/common/grpcclient.py
index cc331ef15351d..e12a8f3d6b628 100644
--- a/src/pybind/mgr/diskprediction/common/grpcclient.py
+++ b/src/pybind/mgr/diskprediction/common/grpcclient.py
@@ -6,8 +6,8 @@ import os
 import time
 
 from . import DummyResonse
-import client_pb2
-import client_pb2_grpc
+from . import client_pb2
+from . import client_pb2_grpc
 
 
 def gen_configuration(**kwargs):
diff --git a/src/pybind/mgr/insights/module.py b/src/pybind/mgr/insights/module.py
index 871b3b18493da..613fdbed7ea3c 100644
--- a/src/pybind/mgr/insights/module.py
+++ b/src/pybind/mgr/insights/module.py
@@ -4,7 +4,7 @@ import re
 import threading
 import six
 from mgr_module import MgrModule, CommandResult
-import health as health_util
+from . import health as health_util
 
 # hours of crash history to report
 CRASH_HISTORY_HOURS = 24