Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions myproxy/client/utils/openssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def __init__(self, filePath=None, caDir=None):
in OpenSSL config file where present. caDir can be left out in
which case the substitution is not done"""

SafeConfigParser.__init__(self)
ConfigParser.__init__(self)

self._reqDN = None
self._setFilePath(filePath)
Expand Down Expand Up @@ -185,7 +185,7 @@ def read(self):

idx = re.search('\[\s*\w*\s*\]', fileTxt).span()[0]
config_file.seek(idx)
SafeConfigParser.readfp(self, config_file)
ConfigParser.read_file(self, config_file)

# Filter section names and remove comments from options
for section, val in list(self._sections.items()):
Expand All @@ -211,7 +211,7 @@ def _filtOptVal(self, optVal):
# Leave $dir in place as no CA directory has been set
return filtVal

def readfp(self, fp):
def read_file(self, fp):
"""Set to not implemented as using a file object could be problematic
given read() has to seek ahead to the first actual section to avoid
parsing errors"""
Expand Down