Merge branch 'master' into asyncio

telethon/tl/gzip_packed.py

@@ -13,21 +13,21 @@ class GzipPacked(TLObject):
 
     @staticmethod
     def gzip_if_smaller(request):
-        """Calls request.to_bytes(), and based on a certain threshold,
+        """Calls bytes(request), and based on a certain threshold,
            optionally gzips the resulting data. If the gzipped data is
            smaller than the original byte array, this is returned instead.
 
            Note that this only applies to content related requests.
         """
-        data = request.to_bytes()
+        data = bytes(request)
         # TODO This threshold could be configurable
         if request.content_related and len(data) > 512:
-            gzipped = GzipPacked(data).to_bytes()
+            gzipped = bytes(GzipPacked(data))
             return gzipped if len(gzipped) < len(data) else data
         else:
             return data
 
-    def to_bytes(self):
+    def __bytes__(self):
         # TODO Maybe compress level could be an option
         return struct.pack('<I', GzipPacked.CONSTRUCTOR_ID) + \
                TLObject.serialize_bytes(gzip.compress(self.data))

telethon/tl/message_container.py

@@ -11,10 +11,10 @@ class MessageContainer(TLObject):
         self.content_related = False
         self.messages = messages
 
-    def to_bytes(self):
+    def __bytes__(self):
         return struct.pack(
             '<Ii', MessageContainer.CONSTRUCTOR_ID, len(self.messages)
-        ) + b''.join(m.to_bytes() for m in self.messages)
+        ) + b''.join(bytes(m) for m in self.messages)
 
     @staticmethod
     def iter_read(reader):

telethon/tl/tl_message.py

@@ -12,6 +12,6 @@ class TLMessage(TLObject):
         self.seq_no = session.generate_sequence(request.content_related)
         self.request = request
 
-    def to_bytes(self):
+    def __bytes__(self):
         body = GzipPacked.gzip_if_smaller(self.request)
         return struct.pack('<qii', self.msg_id, self.seq_no, len(body)) + body

telethon/tl/tlobject.py

@@ -125,7 +125,7 @@ class TLObject:
     def to_dict(self, recursive=True):
         return {}
 
-    def to_bytes(self):
+    def __bytes__(self):
         return b''
 
     @staticmethod