From 1234cb032eea61a7bd0ccc477ee7007b6f4ebfcc Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Wed, 1 Nov 2023 15:07:17 +0000 Subject: [PATCH 1/2] replace use of both six and SafeConfigParser with bogstandard ConfigParser --- myproxy/client/utils/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/myproxy/client/utils/__init__.py b/myproxy/client/utils/__init__.py index a3b210a..72b5589 100644 --- a/myproxy/client/utils/__init__.py +++ b/myproxy/client/utils/__init__.py @@ -8,14 +8,14 @@ __copyright__ = "Copyright 2018 United Kingdom Research and Innovation" __license__ = """BSD - See LICENSE file in top-level package directory""" __contact__ = "Philip.Kershaw@stfc.ac.uk" -from six.moves.configparser import SafeConfigParser +from configparser import ConfigParser -class CaseSensitiveConfigParser(SafeConfigParser): +class CaseSensitiveConfigParser(ConfigParser): '''Subclass the SafeConfigParser - to preserve the original string case of config section names ''' def optionxform(self, optionstr): - '''Extend SafeConfigParser.optionxform to preserve case of option names + '''Extend ConfigParser.optionxform to preserve case of option names ''' return optionstr From e088c2a4159a23b0573f128d16f957889bd790e4 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Wed, 1 Nov 2023 15:12:04 +0000 Subject: [PATCH 2/2] replace use of both six and SafeConfigParser with bogstandard ConfigParser --- myproxy/client/utils/openssl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/myproxy/client/utils/openssl.py b/myproxy/client/utils/openssl.py index 345f4eb..93ac695 100644 --- a/myproxy/client/utils/openssl.py +++ b/myproxy/client/utils/openssl.py @@ -12,14 +12,14 @@ import os import six -from six.moves.configparser import SafeConfigParser +from configparser import ConfigParser class OpenSSLConfigError(Exception): """Exceptions related to OpenSSLConfig class""" -class OpenSSLConfig(SafeConfigParser, object): +class OpenSSLConfig(ConfigParser, object): """Wrapper to OpenSSL Configuration file to allow extraction of required distinguished name used for making certificate requests