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

Fix generated RpcError were no longer formatting the value

Browse Source
This commit is contained in:
Lonami Exo 2021-09-28 21:07:15 +02:00
parent 1c15375ea4
commit 5a8c066ff7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
telethon/errors/_rpcbase.py
View File

@ -17,6 +17,10 @@ _NESTS_QUERY = (
class RpcError(Exception): class RpcError(Exception):
def __init__(self, code, message, request=None): def __init__(self, code, message, request=None):
# Special-case '2fa' to exclude the 2 from values
self.values = [int(x) for x in re.findall(r'-?\d+', re.sub(r'^2fa', '', message, flags=re.IGNORECASE))]
self.value = self.values[0] if self.values else None
doc = self.__doc__ doc = self.__doc__
if doc is None: if doc is None:
doc = ( doc = (
@ -25,14 +29,13 @@ class RpcError(Exception):
) )
elif not doc: elif not doc:
doc = '(no description available)' doc = '(no description available)'
elif self.value:
doc = re.sub(r'{(\w+)}', str(self.value), doc)
super().__init__(f'{message}, code={code}{self._fmt_request(request)}: {doc}') super().__init__(f'{message}, code={code}{self._fmt_request(request)}: {doc}')
self.code = code self.code = code
self.message = message self.message = message
self.request = request self.request = request
# Special-case '2fa' to exclude the 2 from values
self.values = [int(x) for x in re.findall(r'-?\d+', re.sub(r'^2fa', '', self.message, flags=re.IGNORECASE))]
self.value = self.values[0] if self.values else None
@staticmethod @staticmethod
def _fmt_request(request): def _fmt_request(request):