Rename generated layer variable to uppercase readonly property

This commit is contained in:
Lonami Exo 2017-09-17 16:17:55 +02:00
parent c84e54b647
commit aea10b103b
2 changed files with 9 additions and 8 deletions

View File

@ -11,7 +11,7 @@ from .errors import (
) )
from .network import authenticator, MtProtoSender, Connection, ConnectionMode from .network import authenticator, MtProtoSender, Connection, ConnectionMode
from .tl import TLObject, Session from .tl import TLObject, Session
from .tl.all_tlobjects import layer from .tl.all_tlobjects import LAYER
from .tl.functions import ( from .tl.functions import (
InitConnectionRequest, InvokeWithLayerRequest, PingRequest InitConnectionRequest, InvokeWithLayerRequest, PingRequest
) )
@ -125,11 +125,11 @@ class TelegramBareClient:
self.session.auth_key, self.session.time_offset = \ self.session.auth_key, self.session.time_offset = \
authenticator.do_authentication(connection) authenticator.do_authentication(connection)
self.session.layer = layer self.session.layer = LAYER
self.session.save() self.session.save()
init_connection = True init_connection = True
else: else:
init_connection = self.session.layer != layer init_connection = self.session.layer != LAYER
self._sender = MtProtoSender(connection, self.session) self._sender = MtProtoSender(connection, self.session)
self._sender.connect() self._sender.connect()
@ -170,7 +170,7 @@ class TelegramBareClient:
return None if initial_query else False return None if initial_query else False
def _init_connection(self, query=None): def _init_connection(self, query=None):
result = self(InvokeWithLayerRequest(layer, InitConnectionRequest( result = self(InvokeWithLayerRequest(LAYER, InitConnectionRequest(
api_id=self.api_id, api_id=self.api_id,
device_model=self.session.device_model, device_model=self.session.device_model,
system_version=self.session.system_version, system_version=self.session.system_version,
@ -180,7 +180,7 @@ class TelegramBareClient:
lang_pack='', # "langPacks are for official apps only" lang_pack='', # "langPacks are for official apps only"
query=query query=query
))) )))
self.session.layer = layer self.session.layer = LAYER
self.session.save() self.session.save()
return result return result

View File

@ -83,9 +83,10 @@ class TLGenerator:
builder.writeln('from . import types, functions') builder.writeln('from . import types, functions')
builder.writeln() builder.writeln()
# Create a variable to indicate which layer this is # Create a read-only property to indicate which layer this is
builder.writeln('layer = {} # Current generated layer'.format( builder.writeln('LAYER = property(fget=lambda: {})'.format(
TLParser.find_layer(scheme_file))) TLParser.find_layer(scheme_file))
)
builder.writeln() builder.writeln()
# Then create the dictionary containing constructor_id: class # Then create the dictionary containing constructor_id: class