mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-10 04:55:48 +01:00
Code

Rename SafeConfigParser to ConfigParser

Browse Source 
configparser.SafeConfigParser has been changed to configparser.ConfigParser
upstream in Python 3.2. Warnings are saying that the alias will be
removed in future versions.

Signed-off-by: Scott Bahling <sbahling@suse.com>
This commit is contained in:
Scott Bahling 2020-01-28 18:21:26 +01:00
parent 096cd25faf
commit b9adde96b6
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, ): if sys.version_info >= ( 3, ):
import configparser import configparser
ConfigParser = configparser.ConfigParser
else: else:
#python 2.x #python 2.x
import ConfigParser as configparser import ConfigParser as configparser
ConfigParser = configparser.SafeConfigParser
import re import re
@ -188,7 +190,7 @@ class OptionLine(Line):
self.format(line) self.format(line)
def format(self, line): def format(self, line):
mo = configparser.ConfigParser.OPTCRE.match(line.strip()) mo = ConfigParser.OPTCRE.match(line.strip())
key, val = mo.group('option', 'value') key, val = mo.group('option', 'value')
self.frmt = line.replace(key.strip(), '%s', 1) self.frmt = line.replace(key.strip(), '%s', 1)
pos = val.find(' ;') pos = val.find(' ;')
@ -201,7 +203,7 @@ class OptionLine(Line):
return self.value return self.value
class OscConfigParser(configparser.SafeConfigParser): class OscConfigParser(ConfigParser):
""" """
OscConfigParser() behaves like a normal ConfigParser() object. The OscConfigParser() behaves like a normal ConfigParser() object. The
only differences is that it preserves the order+format of configuration entries only differences is that it preserves the order+format of configuration entries
@ -210,7 +212,7 @@ class OscConfigParser(configparser.SafeConfigParser):
class. class.
""" """
def __init__(self, defaults={}): def __init__(self, defaults={}):
configparser.SafeConfigParser.__init__(self, defaults) ConfigParser.__init__(self, defaults)
self._sections = ConfigLineOrder() self._sections = ConfigLineOrder()
# XXX: unfortunately we have to override the _read() method from the ConfigParser() # 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(str(self))
fp.write('\n') fp.write('\n')
else: else:
configparser.SafeConfigParser.write(self, fp) ConfigParser.write(self, fp)
def has_option(self, section, option, proper=False, **kwargs): def has_option(self, section, option, proper=False, **kwargs):
""" """
@ -329,7 +331,7 @@ class OscConfigParser(configparser.SafeConfigParser):
""" """
if proper: if proper:
return self.optionxform(option) in self._sections[section].keys() 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! # XXX: simplify!
def __str__(self): def __str__(self):