From fa0dbcfd0eddbf6b7369b39fb8a10af8ed37e855 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Thu, 29 Oct 2020 10:20:06 -0400 Subject: [PATCH] Configs are always unicode now. --- src/allmydata/node.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/allmydata/node.py b/src/allmydata/node.py index 8b8bfb79d..1aa39b183 100644 --- a/src/allmydata/node.py +++ b/src/allmydata/node.py @@ -277,13 +277,8 @@ class _Config(object): self._basedir = abspath_expanduser_unicode(unicode(basedir)) self._config_fname = config_fname self.config = configparser - - nickname_utf8 = self.get_config("node", "nickname", "") - 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 + self.nickname = self.get_config("node", "nickname", u"") + assert isinstance(self.nickname, unicode) def validate(self, valid_config_sections): configutil.validate_config(self._config_fname, self.config, valid_config_sections)