From aea10b103b989a43c607e33dc756c3af8a2e4936 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sun, 17 Sep 2017 16:17:55 +0200 Subject: [PATCH] Rename generated layer variable to uppercase readonly property --- telethon/telegram_bare_client.py | 10 +++++----- telethon_generator/tl_generator.py | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/telethon/telegram_bare_client.py b/telethon/telegram_bare_client.py index 5f0ba1a0..cb78942f 100644 --- a/telethon/telegram_bare_client.py +++ b/telethon/telegram_bare_client.py @@ -11,7 +11,7 @@ from .errors import ( ) from .network import authenticator, MtProtoSender, Connection, ConnectionMode from .tl import TLObject, Session -from .tl.all_tlobjects import layer +from .tl.all_tlobjects import LAYER from .tl.functions import ( InitConnectionRequest, InvokeWithLayerRequest, PingRequest ) @@ -125,11 +125,11 @@ class TelegramBareClient: self.session.auth_key, self.session.time_offset = \ authenticator.do_authentication(connection) - self.session.layer = layer + self.session.layer = LAYER self.session.save() init_connection = True else: - init_connection = self.session.layer != layer + init_connection = self.session.layer != LAYER self._sender = MtProtoSender(connection, self.session) self._sender.connect() @@ -170,7 +170,7 @@ class TelegramBareClient: return None if initial_query else False def _init_connection(self, query=None): - result = self(InvokeWithLayerRequest(layer, InitConnectionRequest( + result = self(InvokeWithLayerRequest(LAYER, InitConnectionRequest( api_id=self.api_id, device_model=self.session.device_model, system_version=self.session.system_version, @@ -180,7 +180,7 @@ class TelegramBareClient: lang_pack='', # "langPacks are for official apps only" query=query ))) - self.session.layer = layer + self.session.layer = LAYER self.session.save() return result diff --git a/telethon_generator/tl_generator.py b/telethon_generator/tl_generator.py index f7160444..4a237060 100644 --- a/telethon_generator/tl_generator.py +++ b/telethon_generator/tl_generator.py @@ -83,9 +83,10 @@ class TLGenerator: builder.writeln('from . import types, functions') builder.writeln() - # Create a variable to indicate which layer this is - builder.writeln('layer = {} # Current generated layer'.format( - TLParser.find_layer(scheme_file))) + # Create a read-only property to indicate which layer this is + builder.writeln('LAYER = property(fget=lambda: {})'.format( + TLParser.find_layer(scheme_file)) + ) builder.writeln() # Then create the dictionary containing constructor_id: class