diff --git a/pyrogram/errors/rpc_error.py b/pyrogram/errors/rpc_error.py index 444447f2..63375f19 100644 --- a/pyrogram/errors/rpc_error.py +++ b/pyrogram/errors/rpc_error.py @@ -30,11 +30,11 @@ class RPCError(Exception): ID = None CODE = None NAME = None - MESSAGE = "{x}" + MESSAGE = "{value}" def __init__( self, - x: Union[int, str, raw.types.RpcError] = None, + value: Union[int, str, raw.types.RpcError] = None, rpc_name: str = None, is_unknown: bool = False, is_signed: bool = False @@ -43,18 +43,18 @@ class RPCError(Exception): "-" if is_signed else "", self.CODE, self.ID or self.NAME, - self.MESSAGE.format(x=x), + self.MESSAGE.format(value=value), f'(caused by "{rpc_name}")' if rpc_name else "" )) try: - self.x = int(x) + self.value = int(value) except (ValueError, TypeError): - self.x = x + self.value = value if is_unknown: with open("unknown_errors.txt", "a", encoding="utf-8") as f: - f.write(f"{datetime.now()}\t{x}\t{rpc_name}\n") + f.write(f"{datetime.now()}\t{value}\t{rpc_name}\n") @staticmethod def raise_it(rpc_error: "raw.types.RpcError", rpc_type: Type[TLObject]): @@ -68,7 +68,7 @@ class RPCError(Exception): if error_code not in exceptions: raise UnknownError( - x=f"[{error_code} {error_message}]", + value=f"[{error_code} {error_message}]", rpc_name=rpc_name, is_unknown=True, is_signed=is_signed @@ -80,18 +80,18 @@ class RPCError(Exception): raise getattr( import_module("pyrogram.errors"), exceptions[error_code]["_"] - )(x=f"[{error_code} {error_message}]", + )(value=f"[{error_code} {error_message}]", rpc_name=rpc_name, is_unknown=True, is_signed=is_signed) - x = re.search(r"_(\d+)", error_message) - x = x.group(1) if x is not None else x + value = re.search(r"_(\d+)", error_message) + value = value.group(1) if value is not None else value raise getattr( import_module("pyrogram.errors"), exceptions[error_code][error_id] - )(x=x, + )(value=value, rpc_name=rpc_name, is_unknown=False, is_signed=is_signed) diff --git a/pyrogram/methods/auth/send_code.py b/pyrogram/methods/auth/send_code.py index 5a4f87ea..5f7f7091 100644 --- a/pyrogram/methods/auth/send_code.py +++ b/pyrogram/methods/auth/send_code.py @@ -60,7 +60,7 @@ class SendCode: except (PhoneMigrate, NetworkMigrate) as e: await self.session.stop() - await self.storage.dc_id(e.x) + await self.storage.dc_id(e.value) await self.storage.auth_key( await Auth( self, await self.storage.dc_id(), diff --git a/pyrogram/methods/auth/sign_in_bot.py b/pyrogram/methods/auth/sign_in_bot.py index 5f2e68b5..dd322a8e 100644 --- a/pyrogram/methods/auth/sign_in_bot.py +++ b/pyrogram/methods/auth/sign_in_bot.py @@ -57,7 +57,7 @@ class SignInBot: except UserMigrate as e: await self.session.stop() - await self.storage.dc_id(e.x) + await self.storage.dc_id(e.value) await self.storage.auth_key( await Auth( self, await self.storage.dc_id(), diff --git a/pyrogram/methods/bots/get_inline_bot_results.py b/pyrogram/methods/bots/get_inline_bot_results.py index a71fbad8..f145cc8c 100644 --- a/pyrogram/methods/bots/get_inline_bot_results.py +++ b/pyrogram/methods/bots/get_inline_bot_results.py @@ -84,7 +84,7 @@ class GetInlineBotResults: ) except UnknownError as e: # TODO: Add this -503 Timeout error into the Error DB - if e.x.error_code == -503 and e.x.error_message == "Timeout": + if e.value.error_code == -503 and e.value.error_message == "Timeout": raise TimeoutError("The inline bot didn't answer in time") from None else: raise e diff --git a/pyrogram/methods/messages/send_animation.py b/pyrogram/methods/messages/send_animation.py index 9403b1e4..e45a0714 100644 --- a/pyrogram/methods/messages/send_animation.py +++ b/pyrogram/methods/messages/send_animation.py @@ -230,7 +230,7 @@ class SendAnimation: ) ) except FilePartMissing as e: - await self.save_file(animation, file_id=file.id, file_part=e.x) + await self.save_file(animation, file_id=file.id, file_part=e.value) else: for i in r.updates: if isinstance(i, (raw.types.UpdateNewMessage, diff --git a/pyrogram/methods/messages/send_audio.py b/pyrogram/methods/messages/send_audio.py index e0a98f85..8c2624a8 100644 --- a/pyrogram/methods/messages/send_audio.py +++ b/pyrogram/methods/messages/send_audio.py @@ -224,7 +224,7 @@ class SendAudio: ) ) except FilePartMissing as e: - await self.save_file(audio, file_id=file.id, file_part=e.x) + await self.save_file(audio, file_id=file.id, file_part=e.value) else: for i in r.updates: if isinstance(i, (raw.types.UpdateNewMessage, diff --git a/pyrogram/methods/messages/send_document.py b/pyrogram/methods/messages/send_document.py index 5b480cb3..c1179cb0 100644 --- a/pyrogram/methods/messages/send_document.py +++ b/pyrogram/methods/messages/send_document.py @@ -202,7 +202,7 @@ class SendDocument: ) ) except FilePartMissing as e: - await self.save_file(document, file_id=file.id, file_part=e.x) + await self.save_file(document, file_id=file.id, file_part=e.value) else: for i in r.updates: if isinstance(i, (raw.types.UpdateNewMessage, diff --git a/pyrogram/methods/messages/send_photo.py b/pyrogram/methods/messages/send_photo.py index e536d3a0..5391b2f6 100644 --- a/pyrogram/methods/messages/send_photo.py +++ b/pyrogram/methods/messages/send_photo.py @@ -179,7 +179,7 @@ class SendPhoto: ) ) except FilePartMissing as e: - await self.save_file(photo, file_id=file.id, file_part=e.x) + await self.save_file(photo, file_id=file.id, file_part=e.value) else: for i in r.updates: if isinstance(i, (raw.types.UpdateNewMessage, diff --git a/pyrogram/methods/messages/send_sticker.py b/pyrogram/methods/messages/send_sticker.py index ca6f47a5..d0b66fb1 100644 --- a/pyrogram/methods/messages/send_sticker.py +++ b/pyrogram/methods/messages/send_sticker.py @@ -161,7 +161,7 @@ class SendSticker: ) ) except FilePartMissing as e: - await self.save_file(sticker, file_id=file.id, file_part=e.x) + await self.save_file(sticker, file_id=file.id, file_part=e.value) else: for i in r.updates: if isinstance(i, (raw.types.UpdateNewMessage, diff --git a/pyrogram/methods/messages/send_video.py b/pyrogram/methods/messages/send_video.py index e1c245b1..49674076 100644 --- a/pyrogram/methods/messages/send_video.py +++ b/pyrogram/methods/messages/send_video.py @@ -236,7 +236,7 @@ class SendVideo: ) ) except FilePartMissing as e: - await self.save_file(video, file_id=file.id, file_part=e.x) + await self.save_file(video, file_id=file.id, file_part=e.value) else: for i in r.updates: if isinstance(i, (raw.types.UpdateNewMessage, diff --git a/pyrogram/methods/messages/send_video_note.py b/pyrogram/methods/messages/send_video_note.py index 7412e0ea..ce6240d9 100644 --- a/pyrogram/methods/messages/send_video_note.py +++ b/pyrogram/methods/messages/send_video_note.py @@ -185,7 +185,7 @@ class SendVideoNote: ) ) except FilePartMissing as e: - await self.save_file(video_note, file_id=file.id, file_part=e.x) + await self.save_file(video_note, file_id=file.id, file_part=e.value) else: for i in r.updates: if isinstance(i, (raw.types.UpdateNewMessage, diff --git a/pyrogram/methods/messages/send_voice.py b/pyrogram/methods/messages/send_voice.py index 08e1bdc0..9bc64565 100644 --- a/pyrogram/methods/messages/send_voice.py +++ b/pyrogram/methods/messages/send_voice.py @@ -186,7 +186,7 @@ class SendVoice: ) ) except FilePartMissing as e: - await self.save_file(voice, file_id=file.id, file_part=e.x) + await self.save_file(voice, file_id=file.id, file_part=e.value) else: for i in r.updates: if isinstance(i, (raw.types.UpdateNewMessage, diff --git a/pyrogram/session/session.py b/pyrogram/session/session.py index 3b0edca2..b50bb6d7 100644 --- a/pyrogram/session/session.py +++ b/pyrogram/session/session.py @@ -359,7 +359,7 @@ class Session: try: return await self.send(query, timeout=timeout) except FloodWait as e: - amount = e.x + amount = e.value if amount > sleep_threshold >= 0: raise