]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/rook: Fix Python 2 regression 27516/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Thu, 11 Apr 2019 13:32:13 +0000 (15:32 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 11 Apr 2019 13:36:33 +0000 (15:36 +0200)
Fixes: http://tracker.ceph.com/issues/39250
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/pybind/mgr/rook/rook_cluster.py

index 55c755964a0e84c2b4c95992c267595e36a86277..fc8a87a7cc93459bc52529a5c4201e58fa026993 100644 (file)
@@ -9,7 +9,6 @@ This module is runnable outside of ceph-mgr, useful for testing.
 import logging
 import json
 from contextlib import contextmanager
-from typing import List
 
 from six.moves.urllib.parse import urljoin  # pylint: disable=import-error
 
@@ -23,6 +22,7 @@ except ImportError:
 try:
     import orchestrator
     from rook.module import RookEnv
+    from typing import List
 except ImportError:
     pass  # just used for type checking.