mirror of
https://github.com/LonamiWebs/Telethon.git
synced 2024-11-22 17:36:34 +03:00
Stop querying terminal size and other warnings (#115)
This commit is contained in:
parent
13199f737e
commit
279ee81bc3
|
@ -1,4 +1,3 @@
|
||||||
import shutil
|
|
||||||
from getpass import getpass
|
from getpass import getpass
|
||||||
|
|
||||||
from telethon import TelegramClient
|
from telethon import TelegramClient
|
||||||
|
@ -6,9 +5,6 @@ from telethon.errors import SessionPasswordNeededError
|
||||||
from telethon.tl.types import UpdateShortChatMessage, UpdateShortMessage
|
from telethon.tl.types import UpdateShortChatMessage, UpdateShortMessage
|
||||||
from telethon.utils import get_display_name
|
from telethon.utils import get_display_name
|
||||||
|
|
||||||
# Get the (current) number of lines in the terminal
|
|
||||||
cols, rows = shutil.get_terminal_size()
|
|
||||||
|
|
||||||
|
|
||||||
def sprint(string, *args, **kwargs):
|
def sprint(string, *args, **kwargs):
|
||||||
"""Safe Print (handle UnicodeEncodeErrors on some terminals)"""
|
"""Safe Print (handle UnicodeEncodeErrors on some terminals)"""
|
||||||
|
@ -47,7 +43,8 @@ class InteractiveTelegramClient(TelegramClient):
|
||||||
Telegram through Telethon, such as listing dialogs (open chats),
|
Telegram through Telethon, such as listing dialogs (open chats),
|
||||||
talking to people, downloading media, and receiving updates.
|
talking to people, downloading media, and receiving updates.
|
||||||
"""
|
"""
|
||||||
def __init__(self, session_user_id, user_phone, api_id, api_hash, proxy=None):
|
def __init__(self, session_user_id, user_phone, api_id, api_hash,
|
||||||
|
proxy=None):
|
||||||
print_title('Initialization')
|
print_title('Initialization')
|
||||||
|
|
||||||
print('Initializing interactive example...')
|
print('Initializing interactive example...')
|
||||||
|
@ -76,7 +73,7 @@ class InteractiveTelegramClient(TelegramClient):
|
||||||
self_user = self.sign_in(user_phone, code)
|
self_user = self.sign_in(user_phone, code)
|
||||||
|
|
||||||
# Two-step verification may be enabled
|
# Two-step verification may be enabled
|
||||||
except SessionPasswordNeededError as e:
|
except SessionPasswordNeededError:
|
||||||
pw = getpass('Two step verification is enabled. '
|
pw = getpass('Two step verification is enabled. '
|
||||||
'Please enter your password: ')
|
'Please enter your password: ')
|
||||||
|
|
||||||
|
@ -120,7 +117,7 @@ class InteractiveTelegramClient(TelegramClient):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
i = int(i if i else 0) - 1
|
i = int(i if i else 0) - 1
|
||||||
# Ensure it is inside the bounds, otherwise set to None and retry
|
# Ensure it is inside the bounds, otherwise retry
|
||||||
if not 0 <= i < dialog_count:
|
if not 0 <= i < dialog_count:
|
||||||
i = None
|
i = None
|
||||||
except ValueError:
|
except ValueError:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user