Merge remote-tracking branch 'remotes/upstream/master' into delete-messages

# Conflicts:
#	telethon/telegram_client.py
This commit is contained in:
JosXa 2017-10-02 16:07:22 +02:00
commit 8e026123f5

View File

@ -1,9 +1,9 @@
import os
import re
from datetime import datetime, timedelta
from functools import lru_cache
from mimetypes import guess_type
from pprint import pprint
import re
try:
import socks
@ -608,7 +608,7 @@ class TelegramClient(TelegramBareClient):
some performance loss.
"""
possible_names = []
if not isinstance(entity, TLObject) or type(entity).subclass_of_id in (
if not isinstance(entity, TLObject) or type(entity).SUBCLASS_OF_ID in (
0x2da17977, 0xc5af5d94, 0x1f4661b9, 0xd49a2697
):
# Maybe it is an user or a chat? Or their full versions?