Skip to content

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

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
jh0ker merged 1 commit into from
Apr 16, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion telegram/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions tests/test_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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):
Expand Down