Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove **kwargs for generated classes (function/types)

Browse Source
This commit is contained in:
Dan 2018-03-23 13:46:43 +01:00
parent 1d9bb18a38
commit ef71dcf56a
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/api/template/class.txt
View File

@ -11,7 +11,7 @@ class {class_name}(Object):
""" """
ID = {object_id} ID = {object_id}
def __init__(self{arguments}, **kwargs): def __init__(self{arguments}):
{fields} {fields}
@staticmethod @staticmethod

47
pyrogram/client/client.py
View File

@ -1974,10 +1974,15 @@ class Client:
Raises: Raises:
:class:`pyrogram.Error` :class:`pyrogram.Error`
""" """
if "Upload" in action.__name__:
action = action(progress)
else:
action = action()
return self.send( return self.send(
functions.messages.SetTyping( functions.messages.SetTyping(
peer=self.resolve_peer(chat_id), peer=self.resolve_peer(chat_id),
action=action(progress=progress) action=action
) )
) )
@ -2171,14 +2176,21 @@ class Client:
md5_sum = "".join([hex(i)[2:].zfill(2) for i in md5_sum.digest()]) md5_sum = "".join([hex(i)[2:].zfill(2) for i in md5_sum.digest()])
break break
session.send( if is_big:
(functions.upload.SaveBigFilePart if is_big else functions.upload.SaveFilePart)( rpc = functions.upload.SaveBigFilePart(
file_id=file_id, file_id=file_id,
file_part=file_part, file_part=file_part,
bytes=chunk, file_total_parts=file_total_parts,
file_total_parts=file_total_parts bytes=chunk
) )
) else:
rpc = functions.upload.SaveFilePart(
file_id=file_id,
file_part=file_part,
bytes=chunk
)
assert self.send(rpc), "Couldn't upload file"
if is_missing_part: if is_missing_part:
return return
@ -2191,14 +2203,22 @@ class Client:
if progress: if progress:
progress(min(file_part * part_size, file_size), file_size) progress(min(file_part * part_size, file_size), file_size)
except Exception as e: except Exception as e:
log.error(e) log.error(e, exc_info=True)
else: else:
return (types.InputFileBig if is_big else types.InputFile)( if is_big:
id=file_id, return types.InputFileBig(
parts=file_total_parts, id=file_id,
name=os.path.basename(path), parts=file_total_parts,
md5_checksum=md5_sum name=os.path.basename(path),
)
)
else:
return types.InputFile(
id=file_id,
parts=file_total_parts,
name=os.path.basename(path),
md5_checksum=md5_sum
)
finally: finally:
session.stop() session.stop()
@ -2318,7 +2338,6 @@ class Client:
while True: while True:
r2 = cdn_session.send( r2 = cdn_session.send(
functions.upload.GetCdnFile( functions.upload.GetCdnFile(
location=location,
file_token=r.file_token, file_token=r.file_token,
offset=offset, offset=offset,
limit=limit limit=limit