diff --git a/.gitignore b/.gitignore index 588a20f5..aef0b91f 100755 --- a/.gitignore +++ b/.gitignore @@ -101,6 +101,3 @@ ENV/ # Rope project settings .ropeproject - -# Developer tests -test.py diff --git a/telethon/telegram_client.py b/telethon/telegram_client.py index 56619ec0..5fb81cc6 100644 --- a/telethon/telegram_client.py +++ b/telethon/telegram_client.py @@ -1,10 +1,9 @@ import os +import re from datetime import datetime, timedelta from functools import lru_cache from mimetypes import guess_type -import re - try: import socks except ImportError: @@ -385,8 +384,6 @@ class TelegramClient(TelegramBareClient): else: return self(messages.DeleteMessagesRequest(message_ids, revoke=revoke)) - - def get_message_history(self, entity, limit=20, @@ -435,7 +432,7 @@ class TelegramClient(TelegramBareClient): utils.find_user_or_chat(m.to_id, result.users, result.chats) for m in result.messages - ] + ] return total_messages, result.messages, entities