From: Rishabh Dave <ridave@redhat.com>
Date: Wed, 18 Sep 2019 12:46:45 +0000 (+0530)
Subject: ceph-volume: avoid backported version of configparser
X-Git-Tag: v12.2.13~123^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc4c4a12a002c4ea72d2d4bdc36f680620e06cd1;p=ceph.git

ceph-volume: avoid backported version of configparser

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 88a8d5d967c9060e525e91f48b623beebee00c6d)
---

diff --git a/src/ceph-volume/ceph_volume/configuration.py b/src/ceph-volume/ceph_volume/configuration.py
index a9b908e1c05..2fee47ffab9 100644
--- a/src/ceph-volume/ceph_volume/configuration.py
+++ b/src/ceph-volume/ceph_volume/configuration.py
@@ -1,7 +1,3 @@
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
 import contextlib
 import logging
 import os
@@ -11,8 +7,10 @@ from ceph_volume import exceptions
 from sys import version_info as sys_version_info
 
 if sys_version_info.major >= 3:
+    import configparser
     conf_parentclass = configparser.ConfigParser
 elif sys_version_info.major < 3:
+    import ConfigParser as configparser
     conf_parentclass = configparser.SafeConfigParser
 else:
     raise RuntimeError('Not expecting python version > 3 yet.')