Rename RPCError.x to RPCError.value

delivrance · delivrance · commit 0e3c2e4412ab · 2022-04-24T11:56:07.000+02:00
diff --git 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 @@ def __init__(
             "-" 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 @@ def raise_it(rpc_error: "raw.types.RpcError", rpc_type: Type[TLObject]):
 
         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 @@ def raise_it(rpc_error: "raw.types.RpcError", rpc_type: Type[TLObject]):
             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
@@ -60,7 +60,7 @@ async def send_code(
             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
@@ -57,7 +57,7 @@ async def sign_in_bot(
             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
@@ -84,7 +84,7 @@ async def get_inline_bot_results(
             )
         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
@@ -230,7 +230,7 @@ def progress(current, total):
                         )
                     )
                 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
@@ -224,7 +224,7 @@ def progress(current, total):
                         )
                     )
                 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
@@ -202,7 +202,7 @@ def progress(current, total):
                         )
                     )
                 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
@@ -179,7 +179,7 @@ async def send_photo(
                         )
                     )
                 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
@@ -161,7 +161,7 @@ async def send_sticker(
                         )
                     )
                 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
@@ -236,7 +236,7 @@ def progress(current, total):
                         )
                     )
                 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
@@ -185,7 +185,7 @@ async def send_video_note(
                         )
                     )
                 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
@@ -186,7 +186,7 @@ async def send_voice(
                         )
                     )
                 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
@@ -359,7 +359,7 @@ async def invoke(
             try:
                 return await self.send(query, timeout=timeout)
             except FloodWait as e:
-                amount = e.x
+                amount = e.value
 
                 if amount > sleep_threshold >= 0:
                     raise

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ async def get_inline_bot_results(`
`84`	`84`	`)`
`85`	`85`	`except UnknownError as e:`
`86`	`86`	`# TODO: Add this -503 Timeout error into the Error DB`
`87`		`- if e.x.error_code == -503 and e.x.error_message == "Timeout":`
	`87`	`+ if e.value.error_code == -503 and e.value.error_message == "Timeout":`
`88`	`88`	`raise TimeoutError("The inline bot didn't answer in time") from None`
`89`	`89`	`else:`
`90`	`90`	`raise e`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ def progress(current, total):`
`230`	`230`	`)`
`231`	`231`	`)`
`232`	`232`	`except FilePartMissing as e:`
`233`		`- await self.save_file(animation, file_id=file.id, file_part=e.x)`
	`233`	`+ await self.save_file(animation, file_id=file.id, file_part=e.value)`
`234`	`234`	`else:`
`235`	`235`	`for i in r.updates:`
`236`	`236`	`if isinstance(i, (raw.types.UpdateNewMessage,`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ def progress(current, total):`
`224`	`224`	`)`
`225`	`225`	`)`
`226`	`226`	`except FilePartMissing as e:`
`227`		`- await self.save_file(audio, file_id=file.id, file_part=e.x)`
	`227`	`+ await self.save_file(audio, file_id=file.id, file_part=e.value)`
`228`	`228`	`else:`
`229`	`229`	`for i in r.updates:`
`230`	`230`	`if isinstance(i, (raw.types.UpdateNewMessage,`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ def progress(current, total):`
`202`	`202`	`)`
`203`	`203`	`)`
`204`	`204`	`except FilePartMissing as e:`
`205`		`- await self.save_file(document, file_id=file.id, file_part=e.x)`
	`205`	`+ await self.save_file(document, file_id=file.id, file_part=e.value)`
`206`	`206`	`else:`
`207`	`207`	`for i in r.updates:`
`208`	`208`	`if isinstance(i, (raw.types.UpdateNewMessage,`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ async def send_photo(`
`179`	`179`	`)`
`180`	`180`	`)`
`181`	`181`	`except FilePartMissing as e:`
`182`		`- await self.save_file(photo, file_id=file.id, file_part=e.x)`
	`182`	`+ await self.save_file(photo, file_id=file.id, file_part=e.value)`
`183`	`183`	`else:`
`184`	`184`	`for i in r.updates:`
`185`	`185`	`if isinstance(i, (raw.types.UpdateNewMessage,`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ async def send_sticker(`
`161`	`161`	`)`
`162`	`162`	`)`
`163`	`163`	`except FilePartMissing as e:`
`164`		`- await self.save_file(sticker, file_id=file.id, file_part=e.x)`
	`164`	`+ await self.save_file(sticker, file_id=file.id, file_part=e.value)`
`165`	`165`	`else:`
`166`	`166`	`for i in r.updates:`
`167`	`167`	`if isinstance(i, (raw.types.UpdateNewMessage,`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ def progress(current, total):`
`236`	`236`	`)`
`237`	`237`	`)`
`238`	`238`	`except FilePartMissing as e:`
`239`		`- await self.save_file(video, file_id=file.id, file_part=e.x)`
	`239`	`+ await self.save_file(video, file_id=file.id, file_part=e.value)`
`240`	`240`	`else:`
`241`	`241`	`for i in r.updates:`
`242`	`242`	`if isinstance(i, (raw.types.UpdateNewMessage,`