ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-17 01:22:19 +03:00
Code Issues Projects Releases Wiki Activity

Switch to built-in configparser module on Linux

Browse Source
This commit is contained in:
Jonathan Harris 2019-09-29 18:59:02 +01:00 committed by Athanasius
parent a4f4483d20
commit c5daf1d563
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.py
View File

@ -85,8 +85,7 @@ elif platform=='win32':
elif platform=='linux':
import codecs
# requires python-iniparse package - ConfigParser that ships with Python < 3.2 doesn't support unicode
from iniparse import RawConfigParser
from configparser import RawConfigParser
class Config(object):
@ -295,9 +294,10 @@ class Config(object):
if not isdir(dirname(self.filename)):
makedirs(dirname(self.filename))
self.config = RawConfigParser()
self.config = RawConfigParser(comment_prefixes = ('#',))
try:
self.config.readfp(codecs.open(self.filename, 'r', 'utf-8'))
with codecs.open(self.filename, 'r') as h:
self.config.read_file(h)
except:
self.config.add_section(self.SECTION)
@ -307,7 +307,9 @@ class Config(object):
def get(self, key):
try:
val = self.config.get(self.SECTION, key)
if u'\n' in val:
if u'\n' in val: # list
# ConfigParser drops the last entry if blank, so we add a spurious ';' entry in set() and remove it here
assert val.split('\n')[-1] == ';', val.split('\n')
return [self._unescape(x) for x in val.split(u'\n')[:-1]]
else:
return self._unescape(val)
@ -335,7 +337,7 @@ class Config(object):
def save(self):
with codecs.open(self.filename, 'w', 'utf-8') as h:
h.write(str(self.config.data))
self.config.write(h)
def close(self):
self.save()