ceph-volume: drop legacy python2 support from configuration.py

python 2 is no longer supported, so clean up the code accordingly.
this also resolves a linter warning.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>

diff --git a/src/ceph-volume/ceph_volume/__init__.py b/src/ceph-volume/ceph_volume/__init__.py
index e1db4042d05d7b113344d6ee320bf12d27370604..59feb5c09152dbd57f6227396ec85cd468933f5d 100644 (file)
--- a/src/ceph-volume/ceph_volume/__init__.py
+++ b/src/ceph-volume/ceph_volume/__init__.py
@@ -53,7 +53,7 @@ class Config:
     ceph: Any = UnloadedConfig()
     cluster: Optional[str] = None
     verbosity: Optional[int] = None
-    path: Optional[str] = None
+    path: str = ''
     log_path: str = ''
     dmcrypt_no_workqueue: bool = False
 

diff --git a/src/ceph-volume/ceph_volume/configuration.py b/src/ceph-volume/ceph_volume/configuration.py
index fffad48ba265a4236d04513d0bc0f3ae231865bd..6322c04fd1548371e99e5cdc1412240726c94b95 100644 (file)
--- a/src/ceph-volume/ceph_volume/configuration.py
+++ b/src/ceph-volume/ceph_volume/configuration.py
@@ -5,18 +5,9 @@ import re
 from ceph_volume import terminal, conf
 from ceph_volume import exceptions
 from sys import version_info as sys_version_info
+import configparser
 from typing import Optional
 
-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.')
-
-
 logger = logging.getLogger(__name__)
 
 
@@ -66,7 +57,7 @@ def load(abspath: Optional[str] = None):
         raise RuntimeError('Unable to read configuration file: %s' % abspath)
 
 
-class Conf(conf_parentclass):
+class Conf(configparser.ConfigParser):
     """
     Subclasses from ConfigParser to give a few helpers for Ceph
     configuration.
@@ -82,10 +73,10 @@ class Conf(conf_parentclass):
         except (configparser.NoSectionError, configparser.NoOptionError):
             raise exceptions.ConfigurationKeyError('global', 'fsid')
 
-    def optionxform(self, s):
-        s = s.replace('_', ' ')
-        s = '_'.join(s.split())
-        return s
+    def optionxform(self, optionstr):
+        optionstr = optionstr.replace('_', ' ')
+        optionstr = '_'.join(optionstr.split())
+        return optionstr
 
     def get_safe(self, section, key, default=None, check_valid=True):
         """