LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-08-04 12:10:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 039e396059 into 5cdf92e509

Browse Source
This commit is contained in:
Joscha Götzer 2017-10-20 22:28:11 +00:00 committed by GitHub
commit 273c56aec1
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
telethon/utils.py
View File

@ -42,6 +42,7 @@ def get_display_name(entity):
return '(unknown)' return '(unknown)'
# For some reason, .webp (stickers' format) is not registered # For some reason, .webp (stickers' format) is not registered
add_type('image/webp', '.webp') add_type('image/webp', '.webp')
@ -364,6 +365,14 @@ def find_user_or_chat(peer, users, chats):
pass pass
def find_message(update):
if update.message:
if update.message.message:
return update.message.message
return update.message
return None
def get_appropriated_part_size(file_size): def get_appropriated_part_size(file_size):
"""Gets the appropriated part size when uploading or downloading files, """Gets the appropriated part size when uploading or downloading files,
given an initial file size""" given an initial file size"""

25
telethon_generator/error_generator.py
View File

@ -59,20 +59,16 @@ def get_class_name(error_code):
def write_error(f, code, name, desc, capture_name): def write_error(f, code, name, desc, capture_name):
f.write( f.write(
f'\n' '\n\nclass {}({}):\n def __init__(self, **kwargs):\n '
f'\n' ''.format(name, get_class_name(code))
f'class {name}({get_class_name(code)}):\n'
f' def __init__(self, **kwargs):\n'
f' '
) )
if capture_name: if capture_name:
f.write( f.write(
f"self.{capture_name} = int(kwargs.get('capture', 0))\n" "self.{} = int(kwargs.get('capture', 0))\n ".format(capture_name)
f" "
) )
f.write(f'super(Exception, self).__init__(self, {repr(desc)}') f.write('super(Exception, self).__init__(self, {}'.format(repr(desc)))
if capture_name: if capture_name:
f.write(f'.format(self.{capture_name})') f.write('.format(self.{})'.format(capture_name))
f.write(')\n') f.write(')\n')
@ -132,15 +128,12 @@ def generate_code(output, json_file, errors_desc):
# Everything ready, generate the code # Everything ready, generate the code
with open(output, 'w', encoding='utf-8') as f: with open(output, 'w', encoding='utf-8') as f:
f.write( f.write(
f'from .rpc_base_errors import RPCError, BadMessageError, ' 'from .rpc_base_errors import RPCError, BadMessageError, {}\n'.format(
f'{", ".join(known_base_classes.values())}\n' ", ".join(known_base_classes.values()))
) )
for code, cls in needed_base_classes: for code, cls in needed_base_classes:
f.write( f.write(
f'\n' '\n\nclass {}(RPCError):\n code = {}\n'.format(cls, code)
f'\n'
f'class {cls}(RPCError):\n'
f' code = {code}\n'
) )
patterns = [] # Save this dictionary later in the generated code patterns = [] # Save this dictionary later in the generated code
@ -166,5 +159,5 @@ def generate_code(output, json_file, errors_desc):
f.write('\n\nrpc_errors_all = {\n') f.write('\n\nrpc_errors_all = {\n')
for pattern, name in patterns: for pattern, name in patterns:
f.write(f' {repr(pattern)}: {name},\n') f.write(' {}: {},\n'.format(repr(pattern), name))
f.write('}\n') f.write('}\n')