Merge branch 'develop' into asyncio

delivrance · delivrance · commit cc7901adf8bd · 2018-09-06T20:05:01.000+02:00
diff --git a/compiler/api/compiler.py b/compiler/api/compiler.py
@@ -172,9 +172,8 @@ def start():
 
     with open("{}/source/auth_key.tl".format(HOME), encoding="utf-8") as auth, \
             open("{}/source/sys_msgs.tl".format(HOME), encoding="utf-8") as system, \
-            open("{}/source/main_api.tl".format(HOME), encoding="utf-8") as api, \
-            open("{}/source/pyrogram.tl".format(HOME), encoding="utf-8") as pyrogram:
-        schema = (auth.read() + system.read() + api.read() + pyrogram.read()).splitlines()
+            open("{}/source/main_api.tl".format(HOME), encoding="utf-8") as api:
+        schema = (auth.read() + system.read() + api.read()).splitlines()
 
     with open("{}/template/mtproto.txt".format(HOME), encoding="utf-8") as f:
         mtproto_template = f.read()
diff --git a/compiler/api/source/pyrogram.tl b/compiler/api/source/pyrogram.tl
diff --git a/docs/Makefile b/docs/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = ~/PycharmProjects/pyrogram/venv3.6/bin/sphinx-build
+SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = Pyrogram
 SOURCEDIR     = source
 BUILDDIR      = build
diff --git a/docs/Makefile_ b/docs/Makefile_
diff --git a/pyrogram/api/core/primitives/bool.py b/pyrogram/api/core/primitives/bool.py
@@ -30,7 +30,7 @@ def read(cls, *args) -> bool:
         return cls.value
 
     def __new__(cls) -> bytes:
-        return int.to_bytes(cls.ID, 4, "little")
+        return cls.ID.to_bytes(4, "little")
 
 
 class BoolTrue(BoolFalse):
diff --git a/pyrogram/api/core/primitives/bytes.py b/pyrogram/api/core/primitives/bytes.py
@@ -48,7 +48,7 @@ def __new__(cls, value: bytes) -> bytes:
         else:
             return (
                 bytes([254])
-                + int.to_bytes(length, 3, "little")
+                + length.to_bytes(3, "little")
                 + value
                 + bytes(-length % 4)
             )
diff --git a/pyrogram/api/core/primitives/int.py b/pyrogram/api/core/primitives/int.py
@@ -29,15 +29,12 @@ def read(cls, b: BytesIO, signed: bool = True) -> int:
         return int.from_bytes(b.read(cls.SIZE), "little", signed=signed)
 
     def __new__(cls, value: int, signed: bool = True) -> bytes:
-        return int.to_bytes(value, cls.SIZE, "little", signed=signed)
+        return value.to_bytes(cls.SIZE, "little", signed=signed)
 
 
 class Long(Int):
     SIZE = 8
 
-    def __new__(cls, *args):
-        return super().__new__(cls, *args)
-
 
 class Int128(Int):
     SIZE = 16
diff --git a/pyrogram/api/core/primitives/null.py b/pyrogram/api/core/primitives/null.py
@@ -29,4 +29,4 @@ def read(b: BytesIO, *args) -> None:
         return None
 
     def __new__(cls) -> bytes:
-        return int.to_bytes(cls.ID, 4, "little")
+        return cls.ID.to_bytes(4, "little")
diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py
@@ -619,7 +619,7 @@ def fetch_peers(self, entities: list):
                 if phone is not None:
                     self.peers_by_phone[phone] = input_peer
 
-            if isinstance(entity, types.Chat):
+            if isinstance(entity, (types.Chat, types.ChatForbidden)):
                 chat_id = entity.id
                 peer_id = -chat_id
 
@@ -629,7 +629,7 @@ def fetch_peers(self, entities: list):
 
                 self.peers_by_id[peer_id] = input_peer
 
-            if isinstance(entity, types.Channel):
+            if isinstance(entity, (types.Channel, types.ChannelForbidden)):
                 channel_id = entity.id
                 peer_id = int("-100" + str(channel_id))
 
@@ -638,7 +638,7 @@ def fetch_peers(self, entities: list):
                 if access_hash is None:
                     continue
 
-                username = entity.username
+                username = getattr(entity, "username", None)
 
                 input_peer = types.InputPeerChannel(
                     channel_id=channel_id,
diff --git a/pyrogram/crypto/rsa.py b/pyrogram/crypto/rsa.py
@@ -206,12 +206,8 @@ class RSA:
 
     @classmethod
     def encrypt(cls, data: bytes, fingerprint: int) -> bytes:
-        return int.to_bytes(
-            pow(
-                int.from_bytes(data, "big"),
-                cls.server_public_keys[fingerprint].e,
-                cls.server_public_keys[fingerprint].m
-            ),
-            256,
-            "big"
-        )
+        return pow(
+            int.from_bytes(data, "big"),
+            cls.server_public_keys[fingerprint].e,
+            cls.server_public_keys[fingerprint].m
+        ).to_bytes(256, "big")
diff --git a/pyrogram/session/auth.py b/pyrogram/session/auth.py
@@ -111,8 +111,8 @@ async def create(self):
 
                 data = types.PQInnerData(
                     res_pq.pq,
-                    int.to_bytes(p, 4, "big"),
-                    int.to_bytes(q, 4, "big"),
+                    p.to_bytes(4, "big"),
+                    q.to_bytes(4, "big"),
                     nonce,
                     server_nonce,
                     new_nonce,
@@ -131,17 +131,17 @@ async def create(self):
                     functions.ReqDHParams(
                         nonce,
                         server_nonce,
-                        int.to_bytes(p, 4, "big"),
-                        int.to_bytes(q, 4, "big"),
+                        p.to_bytes(4, "big"),
+                        q.to_bytes(4, "big"),
                         public_key_fingerprint,
                         encrypted_data
                     )
                 )
 
                 encrypted_answer = server_dh_params.encrypted_answer
 
-                server_nonce = int.to_bytes(server_nonce, 16, "little", signed=True)
-                new_nonce = int.to_bytes(new_nonce, 32, "little", signed=True)
+                server_nonce = server_nonce.to_bytes(16, "little", signed=True)
+                new_nonce = new_nonce.to_bytes(32, "little", signed=True)
 
                 tmp_aes_key = (
                     sha1(new_nonce + server_nonce).digest()
@@ -170,7 +170,7 @@ async def create(self):
                 # Step 6
                 g = server_dh_inner_data.g
                 b = int.from_bytes(urandom(256), "big")
-                g_b = int.to_bytes(pow(g, b, dh_prime), 256, "big")
+                g_b = pow(g, b, dh_prime).to_bytes(256, "big")
 
                 retry_id = 0
 
@@ -199,8 +199,8 @@ async def create(self):
 
                 # Step 7; Step 8
                 g_a = int.from_bytes(server_dh_inner_data.g_a, "big")
-                auth_key = int.to_bytes(pow(g_a, b, dh_prime), 256, "big")
-                server_nonce = int.to_bytes(server_nonce, 16, "little", signed=True)
+                auth_key = pow(g_a, b, dh_prime).to_bytes(256, "big")
+                server_nonce = server_nonce.to_bytes(16, "little", signed=True)
 
                 # TODO: Handle errors
 
@@ -235,7 +235,7 @@ async def create(self):
                 # 3rd message
                 assert nonce == set_client_dh_params_answer.nonce
                 assert server_nonce == set_client_dh_params_answer.server_nonce
-                server_nonce = int.to_bytes(server_nonce, 16, "little", signed=True)
+                server_nonce = server_nonce.to_bytes(16, "little", signed=True)
                 log.debug("Nonce fields check: OK")
 
                 # Step 9

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def __new__(cls, value: bytes) -> bytes:`
`48`	`48`	`else:`
`49`	`49`	`return (`
`50`	`50`	`bytes([254])`
`51`		`- + int.to_bytes(length, 3, "little")`
	`51`	`+ + length.to_bytes(3, "little")`
`52`	`52`	`+ value`
`53`	`53`	`+ bytes(-length % 4)`
`54`	`54`	`)`