mgr/volumes: Fix Python 3 import error

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

diff --git a/src/pybind/mgr/volumes/__init__.py b/src/pybind/mgr/volumes/__init__.py
index f99ece4a8ca777f72773fd1959707b0ec01446f0..4c5b97ce82b2781727c592b5f99f476111a250c7 100644 (file)
--- a/src/pybind/mgr/volumes/__init__.py
+++ b/src/pybind/mgr/volumes/__init__.py
@@ -1,2 +1,2 @@
 
-from module import Module
+from .module import Module

diff --git a/src/pybind/mgr/volumes/module.py b/src/pybind/mgr/volumes/module.py
index d366b3f5989b7c276014ee8b647cb0d2b3e8b029..d4289eddb8d247fa1e0c60179392aa86100e893a 100644 (file)
--- a/src/pybind/mgr/volumes/module.py
+++ b/src/pybind/mgr/volumes/module.py
@@ -1,7 +1,10 @@
 from threading import Event
 import errno
 import json
-import Queue
+try:
+    import queue as Queue
+except ImportError:
+    import Queue
 
 from mgr_module import MgrModule
 import orchestrator