LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-22 09:26:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Enable printing of UTF-8, improvement for #70

Browse Source 
Convert strings from UTF-8 to ascii to enable printing in non-compatible shells/terminals with UTF-8.
Non-compatible charaters are removed from the string.
This commit is contained in:
Santiago Reig 2017-05-21 23:57:13 +02:00 committed by Lonami
parent 02a847b64a
commit b477895830
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
telethon/interactive_telegram_client.py
View File

@ -18,7 +18,8 @@ def print_title(title):
print('= {} ='.format(title)) print('= {} ='.format(title))
except UnicodeEncodeError: except UnicodeEncodeError:
# Issue #70, some consoles lack support for certain characters # Issue #70, some consoles lack support for certain characters
print('= {} ='.format('?' * len(title))) title_ascii = title.encode('utf-8',errors='ignore').decode('ascii',errors='ignore')
print('= {} ='.format(title_ascii))
print('=={}=='.format('=' * len(title))) print('=={}=='.format('=' * len(title)))
@ -91,7 +92,9 @@ class InteractiveTelegramClient(TelegramClient):
print('{}. {}'.format(i, get_display_name(entity))) print('{}. {}'.format(i, get_display_name(entity)))
except UnicodeEncodeError: except UnicodeEncodeError:
# Issue #70, some consoles lack support for certain characters # Issue #70, some consoles lack support for certain characters
print('{}. {}'.format(i, '(could not render name)')) name = get_display_name(entity)
name_ascii = name.encode('utf-8',errors='ignore').decode('ascii',errors='ignore')
print('{}. {}'.format(i, name_ascii))
# Let the user decide who they want to talk to # Let the user decide who they want to talk to
print() print()
@ -261,24 +264,40 @@ class InteractiveTelegramClient(TelegramClient):
@staticmethod @staticmethod
def update_handler(update_object): def update_handler(update_object):
try: if type(update_object) is UpdateShortMessage:
if type(update_object) is UpdateShortMessage: if update_object.out:
if update_object.out: try:
print('You sent {} to user #{}'.format(update_object.message, print('You sent {} to user #{}'.format(update_object.message,
update_object.user_id)) update_object.user_id))
else: except UnicodeEncodeError:
message_ascii = update_object.message.encode('utf-8',errors='ignore').decode('ascii',errors='ignore')
print('You sent {} to user #{}'.format(message_ascii,
update_object.user_id))
else:
try:
print('[User #{} sent {}]'.format(update_object.user_id, print('[User #{} sent {}]'.format(update_object.user_id,
update_object.message)) update_object.message))
except UnicodeEncodeError:
message_ascii = update_object.message.encode('utf-8',errors='ignore').decode('ascii',errors='ignore')
print('[User #{} sent {}]'.format(update_object.user_id,
message_ascii))
elif type(update_object) is UpdateShortChatMessage: elif type(update_object) is UpdateShortChatMessage:
if update_object.out: if update_object.out:
try:
print('You sent {} to chat #{}'.format(update_object.message, print('You sent {} to chat #{}'.format(update_object.message,
update_object.chat_id)) update_object.chat_id))
else: except UnicodeEncodeError:
message_ascii = update_object.message.encode('utf-8',errors='ignore').decode('ascii',errors='ignore')
print('You sent {} to chat #{}'.format(message_ascii,
update_object.chat_id))
else:
try:
print('[Chat #{}, user #{} sent {}]'.format( print('[Chat #{}, user #{} sent {}]'.format(
update_object.chat_id, update_object.from_id, update_object.chat_id, update_object.from_id,
update_object.message)) update_object.message))
except UnicodeEncodeError: except UnicodeEncodeError:
# Issue #70, some consoles lack support for certain characters message_ascii = update_object.message.encode('utf-8',errors='ignore').decode('ascii',errors='ignore')
print('(Could not print update since it contains ' print('[Chat #{}, user #{} sent {}]'.format(
'characters your terminal does not support)') update_object.chat_id, update_object.from_id,
message_ascii))