]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: avoid backported version of configparser 30677/head
authorRishabh Dave <ridave@redhat.com>
Wed, 18 Sep 2019 12:46:45 +0000 (18:16 +0530)
committerJakub Sobczak <ksobczak16@gmail.com>
Tue, 1 Oct 2019 19:16:26 +0000 (21:16 +0200)
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 88a8d5d967c9060e525e91f48b623beebee00c6d)

src/ceph-volume/ceph_volume/configuration.py

index a9b908e1c05826576603a5683456a7428c5b53d7..2fee47ffab910ad4c4310bbc6581c5c769a0bd9f 100644 (file)
@@ -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.')