From e8061e7971b68f2bbb77d81217bd1c54973e957c Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Fri, 13 Nov 2020 19:12:03 +0000
Subject: [PATCH] Remove six.PY3 conditions

As we have dropped support for python2 some time ago, we should also
get rid of the six conditions for py2/py3 support.

Change-Id: Ic91f762b684917159df07158f71a6f6e199b5cf6
---
 config_tempest/main.py         |  6 +-----
 config_tempest/tempest_conf.py | 20 +++++---------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/config_tempest/main.py b/config_tempest/main.py
index 76ba531a..891dff38 100755
--- a/config_tempest/main.py
+++ b/config_tempest/main.py
@@ -37,7 +37,6 @@ obtained by querying the cloud.
 import argparse
 import logging
 import os
-import six
 import sys
 
 import openstack
@@ -133,10 +132,7 @@ def read_deployer_input(deployer_input_file, conf):
     """
     LOG.info("Adding options from deployer-input file '%s'",
              deployer_input_file)
-    if six.PY3:
-        deployer_input = configparser.ConfigParser()
-    else:
-        deployer_input = configparser.SafeConfigParser()
+    deployer_input = configparser.ConfigParser()
     deployer_input.read(deployer_input_file)
     for section in deployer_input.sections():
         # There are no deployer input options in DEFAULT
diff --git a/config_tempest/tempest_conf.py b/config_tempest/tempest_conf.py
index d6403407..601e419f 100644
--- a/config_tempest/tempest_conf.py
+++ b/config_tempest/tempest_conf.py
@@ -14,7 +14,6 @@
 # under the License.
 
 import os
-import six
 import sys
 
 from config_tempest import constants as C
@@ -23,7 +22,7 @@ from six.moves import configparser
 import tempest.config
 
 
-class TempestConf(configparser.SafeConfigParser):
+class TempestConf(configparser.ConfigParser):
     # causes the config parser to preserve case of the options
     optionxform = str
 
@@ -35,10 +34,7 @@ class TempestConf(configparser.SafeConfigParser):
 
     def __init__(self, write_credentials=True, **kwargs):
         self.write_credentials = write_credentials
-        if six.PY3:
-            configparser.ConfigParser.__init__(self, **kwargs)
-        else:
-            configparser.SafeConfigParser.__init__(self, **kwargs)
+        configparser.ConfigParser.__init__(self, **kwargs)
 
     def get_bool_value(self, value):
         """Returns boolean value of the string value given.
@@ -76,7 +72,7 @@ class TempestConf(configparser.SafeConfigParser):
                           key, section)
 
     def set(self, section, key, value, priority=False):
-        """Set value in configuration, similar to `SafeConfigParser.set`
+        """Set value in configuration, similar to `ConfigParser.set`
 
         Creates non-existent sections. Keeps track of options which were
         specified by the user and should not be normally overwritten.
@@ -105,10 +101,7 @@ class TempestConf(configparser.SafeConfigParser):
         if priority:
             self.priority_sectionkeys.add((section, key))
         C.LOG.debug("Setting [%s] %s = %s", section, key, value)
-        if six.PY3:
-            configparser.ConfigParser.set(self, section, key, value)
-        else:
-            configparser.SafeConfigParser.set(self, section, key, value)
+        configparser.ConfigParser.set(self, section, key, value)
         return True
 
     def write(self, out_path):
@@ -118,10 +111,7 @@ class TempestConf(configparser.SafeConfigParser):
                        "writing credentials is disabled.")
             self.remove_values(C.ALL_CREDENTIALS_KEYS)
         with open(out_path, 'w') as f:
-            if six.PY3:
-                configparser.ConfigParser.write(self, f)
-            else:
-                configparser.SafeConfigParser.write(self, f)
+            configparser.ConfigParser.write(self, f)
 
     def remove_values(self, to_remove):
         """Remove values from configuration file specified in arguments.