mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-09 22:36:14 +01:00
Code

Merge branch 'master' of https://github.com/sbahling/osc

Browse Source 
Use configparser.ConfigParser instead of configparser.SafeConfigParser,
since the latter will be removed in future python versions. No functional
changes because SafeConfigParser is a ConfigParser except that its __init__
prints a DeprecationWarning.
This commit is contained in:
Marcus Huewe 2020-02-09 15:57:49 +01:00
commit 9b0dcf3535
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osc/OscConfigParser.py
View File

@ -19,9 +19,11 @@ import sys
if sys.version_info >= ( 3, ):
import configparser
ConfigParser = configparser.ConfigParser
else:
#python 2.x
import ConfigParser as configparser
ConfigParser = configparser.SafeConfigParser
import re
@ -188,7 +190,7 @@ class OptionLine(Line):
self.format(line)
def format(self, line):
mo = configparser.ConfigParser.OPTCRE.match(line.strip())
mo = ConfigParser.OPTCRE.match(line.strip())
key, val = mo.group('option', 'value')
self.frmt = line.replace(key.strip(), '%s', 1)
pos = val.find(' ;')
@ -201,7 +203,7 @@ class OptionLine(Line):
return self.value
class OscConfigParser(configparser.SafeConfigParser):
class OscConfigParser(ConfigParser):
"""
OscConfigParser() behaves like a normal ConfigParser() object. The
only differences is that it preserves the order+format of configuration entries
@ -210,7 +212,7 @@ class OscConfigParser(configparser.SafeConfigParser):
class.
"""
def __init__(self, defaults={}):
configparser.SafeConfigParser.__init__(self, defaults)
ConfigParser.__init__(self, defaults)
self._sections = ConfigLineOrder()
# XXX: unfortunately we have to override the _read() method from the ConfigParser()
@ -319,7 +321,7 @@ class OscConfigParser(configparser.SafeConfigParser):
fp.write(str(self))
fp.write('\n')
else:
configparser.SafeConfigParser.write(self, fp)
ConfigParser.write(self, fp)
def has_option(self, section, option, proper=False, **kwargs):
"""
@ -329,7 +331,7 @@ class OscConfigParser(configparser.SafeConfigParser):
"""
if proper:
return self.optionxform(option) in self._sections[section].keys()
return configparser.SafeConfigParser.has_option(self, section, option, **kwargs)
return ConfigParser.has_option(self, section, option, **kwargs)
# XXX: simplify!
def __str__(self):