OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2025-03-29 09:40:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

User.full_name convinience property (#949)

Browse source 
Fixes #943
This commit is contained in:
graynk 2017-12-30 18:13:06 +05:00 • committed by Noam Meltzer
parent 5c8470e552
commit d347c0d45e
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
telegram/user.py
View file

@ -83,6 +83,17 @@ class User(TelegramObject):
return '%s %s' % (self.first_name, self.last_name) return '%s %s' % (self.first_name, self.last_name)
return self.first_name return self.first_name
@property
def full_name(self):
"""
:obj:`str`: The users :attr:`first_name` and if present :attr:`last_name`.
"""
if self.last_name:
return '%s %s' % (self.first_name, self.last_name)
return self.first_name
@classmethod @classmethod
def de_json(cls, data, bot): def de_json(cls, data, bot):
if not data: if not data:

5
tests/test_user.py
View file

@ -90,6 +90,11 @@ class TestUser(object):
assert user.name == 'first_name' assert user.name == 'first_name'
user.username = self.username user.username = self.username
assert user.name == '@username' assert user.name == '@username'
def test_full_name(self, user):
assert user.full_name == 'first_name last_name'
user.last_name = None
assert user.full_name == 'first_name'
def test_get_profile_photos(self, monkeypatch, user): def test_get_profile_photos(self, monkeypatch, user):
def test(_, *args, **kwargs): def test(_, *args, **kwargs):