Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed relative config loading with utf-8 names

Browse Source
This commit is contained in:
Uriziel 2015-12-26 18:30:07 +01:00
parent 1964d25e96
commit a59c7c253c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syncplay/ui/ConfigurationGetter.py
View File

@ -354,7 +354,7 @@ class ConfigurationGetter(object):
for name in constants.CONFIG_NAMES: for name in constants.CONFIG_NAMES:
path = location + os.path.sep + name path = location + os.path.sep + name
if os.path.isfile(path) and (os.name == 'nt' or path != os.path.join(os.getenv('HOME', '.'), constants.DEFAULT_CONFIG_NAME_LINUX)): if os.path.isfile(path) and (os.name == 'nt' or path != os.path.join(os.getenv('HOME', '.'), constants.DEFAULT_CONFIG_NAME_LINUX)):
loadedPaths.append("'" + os.path.normpath(path) + "'") loadedPaths.append("'" + os.path.normpath(path).decode('utf-8') + "'")
self._parseConfigFile(path, createConfig=False) self._parseConfigFile(path, createConfig=False)
self._checkConfig() self._checkConfig()
return loadedPaths return loadedPaths
@ -427,4 +427,4 @@ class SafeConfigParserUnicode(SafeConfigParser):
if (value is not None) or (self._optcre == self.OPTCRE): if (value is not None) or (self._optcre == self.OPTCRE):
key = " = ".join((key, unicode(value).replace('\n', '\n\t'))) key = " = ".join((key, unicode(value).replace('\n', '\n\t')))
fp.write("%s\n" % key) fp.write("%s\n" % key)
fp.write("\n") fp.write("\n")