ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-07 11:50:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Configs are always unicode now.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-10-29 10:20:06 -04:00
parent 9a4df38db9
commit fa0dbcfd0e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/allmydata/node.py
View File

@ -277,13 +277,8 @@ class _Config(object):
self._basedir = abspath_expanduser_unicode(unicode(basedir)) self._basedir = abspath_expanduser_unicode(unicode(basedir))
self._config_fname = config_fname self._config_fname = config_fname
self.config = configparser self.config = configparser
self.nickname = self.get_config("node", "nickname", u"<unspecified>")
nickname_utf8 = self.get_config("node", "nickname", "<unspecified>") assert isinstance(self.nickname, unicode)
if isinstance(nickname_utf8, bytes): # Python 2
self.nickname = nickname_utf8.decode("utf-8")
else:
self.nickname = nickname_utf8
assert type(self.nickname) is unicode
def validate(self, valid_config_sections): def validate(self, valid_config_sections):
configutil.validate_config(self._config_fname, self.config, valid_config_sections) configutil.validate_config(self._config_fname, self.config, valid_config_sections)