From dede5520dd117a221987343150078c139bf5d69d Mon Sep 17 00:00:00 2001
From: Lonami Exo <totufals@hotmail.com>
Date: Thu, 29 Mar 2018 00:56:05 +0200
Subject: [PATCH] Rename .entities -> ._entities from 7e9d19d to avoid
 collision

---
 telethon/events/__init__.py | 12 ++++++------
 telethon/update_state.py    |  9 +++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/telethon/events/__init__.py b/telethon/events/__init__.py
index 1364e89e..8ae63ea9 100644
--- a/telethon/events/__init__.py
+++ b/telethon/events/__init__.py
@@ -301,7 +301,7 @@ class NewMessage(_EventBuilder):
         else:
             return
 
-        event._entities = update.entities
+        event._entities = update._entities
         return self._message_filter_event(event)
 
     def _message_filter_event(self, event):
@@ -691,7 +691,7 @@ class ChatAction(_EventBuilder):
         else:
             return
 
-        event._entities = update.entities
+        event._entities = update._entities
         return self._filter_event(event)
 
     class Event(_EventCommon):
@@ -936,7 +936,7 @@ class UserUpdate(_EventBuilder):
         else:
             return
 
-        event._entities = update.entities
+        event._entities = update._entities
         return self._filter_event(event)
 
     class Event(_EventCommon):
@@ -1085,7 +1085,7 @@ class MessageEdited(NewMessage):
         else:
             return
 
-        event._entities = update.entities
+        event._entities = update._entities
         return self._message_filter_event(event)
 
     class Event(NewMessage.Event):
@@ -1111,7 +1111,7 @@ class MessageDeleted(_EventBuilder):
         else:
             return
 
-        event._entities = update.entities
+        event._entities = update._entities
         return self._filter_event(event)
 
     class Event(_EventCommon):
@@ -1162,7 +1162,7 @@ class MessageRead(_EventBuilder):
         if self.inbox == event.outbox:
             return
 
-        event._entities = update.entities
+        event._entities = update._entities
         return self._filter_event(event)
 
     class Event(_EventCommon):
diff --git a/telethon/update_state.py b/telethon/update_state.py
index 509697a0..e679e99e 100644
--- a/telethon/update_state.py
+++ b/telethon/update_state.py
@@ -129,12 +129,9 @@ class UpdateState:
             # After running the script for over an hour and receiving over
             # 1000 updates, the only duplicates received were users going
             # online or offline. We can trust the server until new reports.
-            #
-            # TODO Note somewhere that all updates are modified to include
-            # .entities, which is a dictionary you can access but may be empty.
             # This should only be used as read-only.
             if isinstance(update, tl.UpdateShort):
-                update.update.entities = {}
+                update.update._entities = {}
                 self._updates.put(update.update)
             # Expand "Updates" into "Update", and pass these to callbacks.
             # Since .users and .chats have already been processed, we
@@ -143,9 +140,9 @@ class UpdateState:
                 entities = {utils.get_peer_id(x): x for x in
                             itertools.chain(update.users, update.chats)}
                 for u in update.updates:
-                    u.entities = entities
+                    u._entities = entities
                     self._updates.put(u)
             # TODO Handle "tl.UpdatesTooLong"
             else:
-                update.entities = {}
+                update._entities = {}
                 self._updates.put(update)