From f189b83d0a1c7b664563de067563d3e33386f3ed Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 3 Mar 2020 08:15:50 -0700 Subject: [PATCH] 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 (cherry picked from commit f213b646db883e4d9899d5ecb51f7ac591237901) --- .../mgr/volumes/fs/operations/versions/metadata_manager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 7aa05c0f61775..ef2d23e2dbad0 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: -- 2.39.5