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

Stop treating .to_dict() with no args as a special case

Browse Source
This commit is contained in:
Lonami Exo 2017-09-23 10:59:08 +02:00
parent 0b48b1ec8a
commit 5701029fbf
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
telethon_generator/tl_generator.py
View File

@ -264,9 +264,11 @@ class TLGenerator:
builder.end_block() builder.end_block()
# Write the to_dict(self) method # Write the to_dict(self) method
if args:
builder.writeln('def to_dict(self, recursive=True):') builder.writeln('def to_dict(self, recursive=True):')
if args:
builder.writeln('return {') builder.writeln('return {')
else:
builder.write('return {')
builder.current_indent += 1 builder.current_indent += 1
base_types = ('string', 'bytes', 'int', 'long', 'int128', base_types = ('string', 'bytes', 'int', 'long', 'int128',
@ -276,10 +278,8 @@ class TLGenerator:
builder.write("'{}': ".format(arg.name)) builder.write("'{}': ".format(arg.name))
if arg.type in base_types: if arg.type in base_types:
if arg.is_vector: if arg.is_vector:
builder.write( builder.write('[] if self.{0} is None else self.{0}[:]'
'[] if self.{0} is None else self.{0}[:]' .format(arg.name))
.format(arg.name)
)
else: else:
builder.write('self.{}'.format(arg.name)) builder.write('self.{}'.format(arg.name))
else: else:
@ -287,22 +287,17 @@ class TLGenerator:
builder.write( builder.write(
'([] if self.{0} is None else [None' '([] if self.{0} is None else [None'
' if x is None else x.to_dict() for x in self.{0}]' ' if x is None else x.to_dict() for x in self.{0}]'
') if recursive else self.{0}' ') if recursive else self.{0}'.format(arg.name)
.format(arg.name)
) )
else: else:
builder.write( builder.write(
'(None if self.{0} is None else ' '(None if self.{0} is None else self.{0}.to_dict())'
'self.{0}.to_dict()) if recursive else self.{0}' ' if recursive else self.{0}'.format(arg.name)
.format(arg.name)
) )
builder.writeln(',') builder.writeln(',')
builder.current_indent -= 1 builder.current_indent -= 1
builder.writeln("}") builder.writeln("}")
else:
builder.writeln('def to_dict(self, recursive=True):')
builder.writeln('return {}')
builder.end_block() builder.end_block()