From 668b0138bb4bb4a01bdaf837d23e45881b46dd8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Fri, 9 Oct 2020 15:41:22 +0200 Subject: Revert previous commit, move loggging, fix type error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 627f751e0c00c0f208e0688698d90a0c186b435b. Signed-off-by: Maxime “pep” Buquet --- poezio/user.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'poezio') diff --git a/poezio/user.py b/poezio/user.py index 1bae612f..5aed5031 100644 --- a/poezio/user.py +++ b/poezio/user.py @@ -83,17 +83,15 @@ class User: self.nick = nick def change_color(self, color_name: Optional[str], deterministic=False): - if color_name is None: + color = xhtml.colors.get(color_name or '') + if color is None: if deterministic: self.set_deterministic_color() else: + log.error('Unknown color "%s"', color_name) self.color = choice(get_theme().LIST_COLOR_NICKNAMES) else: - color = xhtml.colors.get(color_name) - if color is None: - log.error('Unknown color "%s"', color_name) - else: - self.color = (color, -1) + self.color = (color, -1) def set_last_talked(self, time: datetime): """ -- cgit v1.2.3