From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 30 Nov 2018 15:47:42 +0000 (+0100)
Subject: mgr/volumes: Fix Python 3 import error
X-Git-Tag: v14.1.0~740^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25344%2Fhead;p=ceph.git

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 f99ece4a8ca7..4c5b97ce82b2 100644
--- 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 d366b3f5989b..d4289eddb8d2 100644
--- 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