Skip to content

Fix documentation & coding style of User.name & User.full_name #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsnoam merged 2 commits into from
Dec 30, 2017
Merged

Fix documentation & coding style of User.name & User.full_name #956

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4508122
User.name & User.full_name - coding style & documentation
tsnoam Dec 30, 2017
830b2cb
Removed the NOTE and mentinoed the "@" prefix.
tsnoam Dec 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions telegram/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,23 @@ def __init__(self,
@property
def name(self):
"""
:obj:`str`: The users :attr:`username` if available, if not it returns the first name and
if present :attr:`first_name` and :attr:`last_name`.
:obj:`str`: Convenience property. If available, returns the user's :attr:`username`
prefixed with "@". If :attr:`username` is not available, returns :attr:`full_name`.

"""

if self.username:
return '@%s' % self.username
if self.last_name:
return '%s %s' % (self.first_name, self.last_name)
return self.first_name
return '@{}'.format(self.username)
return self.full_name

@property
def full_name(self):
"""
:obj:`str`: The users :attr:`first_name` and if present :attr:`last_name`.
:obj:`str`: Convenience property. The user's :attr:`first_name`, followed by (if available)
:attr:`last_name`.

"""

if self.last_name:
return '%s %s' % (self.first_name, self.last_name)
return '{} {}'.format(self.first_name, self.last_name)
return self.first_name

@classmethod
Expand Down