From: Michael Fritch <mfritch@suse.com>
Date: Tue, 3 Mar 2020 15:15:50 +0000 (-0700)
Subject: mgr/volumes: use python version during configparser import
X-Git-Tag: v15.1.1~93^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f213b646db883e4d9899d5ecb51f7ac591237901;p=ceph.git

mgr/volumes: use python version during configparser import

fixes mypy error:

volumes/fs/operations/versions/metadata_manager.py:8: error: Name 'configparser' already defined (by an import)

Fixes: https://tracker.ceph.com/issues/44393
Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py b/src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py
index 7aa05c0f6177..ef2d23e2dbad 100644
--- a/src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py
+++ b/src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py
@@ -1,10 +1,11 @@
 import os
 import errno
 import logging
+import sys
 
-try:
+if sys.version_info >= (3, 2):
     import configparser
-except ImportError:
+else:
     import ConfigParser as configparser
 
 try: