LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-02-03 13:14:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix up some mismatching raise/except types since 6ec6967

Browse Source
This commit is contained in:
Lonami Exo 2017-12-28 11:55:05 +01:00
parent 459022bdab
commit bfff1567af
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
telethon/telegram_client.py
View File

@ -30,7 +30,7 @@ from .tl.functions.contacts import (
GetContactsRequest, ResolveUsernameRequest GetContactsRequest, ResolveUsernameRequest
) )
from .tl.functions.messages import ( from .tl.functions.messages import (
GetDialogsRequest, GetHistoryRequest, ReadHistoryRequest, SendMediaRequest, GetDialogsRequest, GetHistoryRequest, SendMediaRequest,
SendMessageRequest, GetChatsRequest, GetAllDraftsRequest, SendMessageRequest, GetChatsRequest, GetAllDraftsRequest,
CheckChatInviteRequest CheckChatInviteRequest
) )
@ -1091,17 +1091,11 @@ class TelegramClient(TelegramBareClient):
an username, and processes all the found entities on the session. an username, and processes all the found entities on the session.
The string may also be a user link, or a channel/chat invite link. The string may also be a user link, or a channel/chat invite link.
<<<<<<< HEAD
This method has the side effect of adding the found users to the This method has the side effect of adding the found users to the
session database, so it can be queried later without API calls, session database, so it can be queried later without API calls,
if this option is enabled on the session. if this option is enabled on the session.
=======
raise TypeError(
'Cannot turn "{}" into any entity (user or chat)'.format(entity)
)
>>>>>>> 6ec6967ff9a2e09aae70b500273075bdfbae975c
Returns the found entity. Returns the found entity, or raises TypeError if not found.
""" """
phone = utils.parse_phone(string) phone = utils.parse_phone(string)
if phone: if phone:
@ -1125,6 +1119,10 @@ class TelegramClient(TelegramBareClient):
if entity.username.lower() == string: if entity.username.lower() == string:
return entity return entity
raise TypeError(
'Cannot turn "{}" into any entity (user or chat)'.format(string)
)
def get_input_entity(self, peer): def get_input_entity(self, peer):
""" """
Turns the given peer into its input entity version. Most requests Turns the given peer into its input entity version. Most requests
@ -1164,7 +1162,7 @@ class TelegramClient(TelegramBareClient):
if not is_peer: if not is_peer:
try: try:
return utils.get_input_peer(peer) return utils.get_input_peer(peer)
except ValueError: except TypeError:
pass pass
if not is_peer: if not is_peer:
@ -1189,7 +1187,7 @@ class TelegramClient(TelegramBareClient):
if utils.get_peer_id(entity, add_mark=True) == target: if utils.get_peer_id(entity, add_mark=True) == target:
return utils.get_input_peer(entity) return utils.get_input_peer(entity)
raise ValueError( raise TypeError(
'Could not find the input entity corresponding to "{}".' 'Could not find the input entity corresponding to "{}".'
'Make sure you have encountered this peer before.'.format(peer) 'Make sure you have encountered this peer before.'.format(peer)
) )