From cbfb7df643bdf23785f0c1ed2283b420699bc6e0 Mon Sep 17 00:00:00 2001 From: Daniel Reed Date: Mon, 16 Apr 2018 01:37:41 -0700 Subject: [PATCH] Explicitly make Bot.full_name return a unicode object, rather than implicitly a unicode object in Python 3 and a str object on Python 2. (#1063) --- telegram/user.py | 2 +- tests/test_user.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/telegram/user.py b/telegram/user.py index 018dde25e..a407888bd 100644 --- a/telegram/user.py +++ b/telegram/user.py @@ -88,7 +88,7 @@ class User(TelegramObject): """ if self.last_name: - return '{} {}'.format(self.first_name, self.last_name) + return u'{} {}'.format(self.first_name, self.last_name) return self.first_name @classmethod diff --git a/tests/test_user.py b/tests/test_user.py index 67975ca0b..216ed33d8 100644 --- a/tests/test_user.py +++ b/tests/test_user.py @@ -42,8 +42,8 @@ def user(bot): class TestUser(object): id = 1 is_bot = True - first_name = 'first_name' - last_name = 'last_name' + first_name = u'first\u2022name' + last_name = u'last\u2022name' username = 'username' language_code = 'en_us' @@ -85,16 +85,16 @@ class TestUser(object): def test_name(self, user): assert user.name == '@username' user.username = None - assert user.name == 'first_name last_name' + assert user.name == u'first\u2022name last\u2022name' user.last_name = None - assert user.name == 'first_name' + assert user.name == u'first\u2022name' user.username = self.username assert user.name == '@username' def test_full_name(self, user): - assert user.full_name == 'first_name last_name' + assert user.full_name == u'first\u2022name last\u2022name' user.last_name = None - assert user.full_name == 'first_name' + assert user.full_name == u'first\u2022name' def test_get_profile_photos(self, monkeypatch, user): def test(_, *args, **kwargs):