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

Removing circular imports in autogenerated files.

Browse Source
This commit is contained in:
singer 2017-10-20 12:35:03 +03:00
parent 8da6ffd7d5
commit b072caae09
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
telethon/network/authenticator.py
View File

@ -6,7 +6,7 @@ from ..tl.types import (
ResPQ, PQInnerData, ServerDHParamsFail, ServerDHParamsOk, ResPQ, PQInnerData, ServerDHParamsFail, ServerDHParamsOk,
ServerDHInnerData, ClientDHInnerData, DhGenOk, DhGenRetry, DhGenFail ServerDHInnerData, ClientDHInnerData, DhGenOk, DhGenRetry, DhGenFail
) )
from .. import helpers as utils from ..helpers import generate_key_data_from_nonce
from ..crypto import AES, AuthKey, Factorization from ..crypto import AES, AuthKey, Factorization
from ..crypto import rsa from ..crypto import rsa
from ..errors import SecurityError from ..errors import SecurityError
@ -110,7 +110,7 @@ def _do_authentication(connection):
raise SecurityError('Invalid server nonce from server') raise SecurityError('Invalid server nonce from server')
# Step 3 sending: Complete DH Exchange # Step 3 sending: Complete DH Exchange
key, iv = utils.generate_key_data_from_nonce( key, iv = generate_key_data_from_nonce(
res_pq.server_nonce, new_nonce res_pq.server_nonce, new_nonce
) )
plain_text_answer = AES.decrypt_ige( plain_text_answer = AES.decrypt_ige(

27
telethon_generator/tl_generator.py
View File

@ -117,8 +117,18 @@ class TLGenerator:
def _write_init_py(out_dir, depth, namespace_tlobjects, type_constructors): def _write_init_py(out_dir, depth, namespace_tlobjects, type_constructors):
# namespace_tlobjects: {'namespace', [TLObject]} # namespace_tlobjects: {'namespace', [TLObject]}
os.makedirs(out_dir, exist_ok=True) os.makedirs(out_dir, exist_ok=True)
# Generate __init__.py with relative imports to the namespaces
with open(os.path.join(out_dir, '__init__.py'), 'w', encoding='utf-8') as f, \
SourceBuilder(f) as builder:
builder.writeln(AUTO_GEN_NOTICE)
builder.writeln('from . import {}'.format(', '.join(
x for x in namespace_tlobjects.keys() if x
)))
builder.writeln('from .base import *')
for ns, tlobjects in namespace_tlobjects.items(): for ns, tlobjects in namespace_tlobjects.items():
file = os.path.join(out_dir, ns + '.py' if ns else '__init__.py') file = os.path.join(out_dir, ns + '.py' if ns else 'base.py')
with open(file, 'w', encoding='utf-8') as f, \ with open(file, 'w', encoding='utf-8') as f, \
SourceBuilder(f) as builder: SourceBuilder(f) as builder:
builder.writeln(AUTO_GEN_NOTICE) builder.writeln(AUTO_GEN_NOTICE)
@ -127,18 +137,8 @@ class TLGenerator:
# so they all can be serialized and sent, however, only the # so they all can be serialized and sent, however, only the
# functions are "content_related". # functions are "content_related".
builder.writeln( builder.writeln(
'from telethon.tl.tlobject import TLObject'.format('.' * depth) 'from {}.tl.tlobject import TLObject'.format('.' * depth)
) )
builder.writeln(
'import telethon.tl.types'.format('.' * depth)
)
# Add the relative imports to the namespaces,
# unless we already are in a namespace.
if not ns:
builder.writeln('from . import {}'.format(', '.join(
x for x in namespace_tlobjects.keys() if x
)))
# Import 'get_input_*' utils # Import 'get_input_*' utils
# TODO Support them on types too # TODO Support them on types too
@ -644,7 +644,8 @@ class TLGenerator:
if not arg.skip_constructor_id: if not arg.skip_constructor_id:
builder.writeln('{} = reader.tgread_object()'.format(name)) builder.writeln('{} = reader.tgread_object()'.format(name))
else: else:
builder.writeln('{} = types.{}.from_reader(reader)'.format( builder.writeln('from . import {}'.format(TLObject.class_name_for(arg.type)))
builder.writeln('{} = {}.from_reader(reader)'.format(
name, TLObject.class_name_for(arg.type))) name, TLObject.class_name_for(arg.type)))
# End vector and flag blocks if required (if we opened them before) # End vector and flag blocks if required (if we opened them before)