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. (python-telegram-bot#1063)

nmlorg · jh0ker · commit cbfb7df643bd · 2018-04-16T10:37:41.000+02:00
diff --git a/telegram/user.py b/telegram/user.py
@@ -88,7 +88,7 @@ def full_name(self):
 
         """
         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
@@ -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 @@ def test_de_json_without_username_and_last_name(self, json_dict, bot):
     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):
