]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/volumes: use python version during configparser import
authorMichael Fritch <mfritch@suse.com>
Tue, 3 Mar 2020 15:15:50 +0000 (08:15 -0700)
committerRamana Raja <rraja@redhat.com>
Thu, 19 Mar 2020 12:57:32 +0000 (18:27 +0530)
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>
(cherry picked from commit f213b646db883e4d9899d5ecb51f7ac591237901)

src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py

index 7aa05c0f617755b8cfe650387b474e72bb4ad864..ef2d23e2dbad012d24058dcae93877eadb0a82fd 100644 (file)
@@ -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: