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 e567e4f72d9222e8afb2e8a159062a421fcf5277..cbc3c30ebf68795231427f4455990ded725e96fc 100644 (file)
--- 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\r
 import errno\r
 from functools import wraps\r
-from httplib import BAD_REQUEST\r
+from six.moves.http_client import BAD_REQUEST\r
 import os\r
 import signal\r
 \r

diff --git a/src/pybind/mgr/diskprediction/common/grpcclient.py b/src/pybind/mgr/diskprediction/common/grpcclient.py
index cc331ef15351d7d84c1d7a3421df91866cedc9f7..e12a8f3d6b628a19a1817c55d6451bdd4c71cdf2 100644 (file)
--- 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 871b3b18493dae558b8ab46db3b867efaa1775d9..613fdbed7ea3cbd21a06f3fe5e16016fc48f5751 100644 (file)
--- 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