From 83a024656c75e88ac3f0996f38938bb7210a76d5 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sat, 9 Jun 2018 22:14:51 +0200 Subject: [PATCH] Rename client.files as client.uploads --- telethon/client/messages.py | 4 ++-- telethon/client/telegrambaseclient.py | 6 ++---- telethon/client/telegramclient.py | 6 ------ telethon/client/{files.py => uploads.py} | 4 +++- 4 files changed, 7 insertions(+), 13 deletions(-) rename telethon/client/{files.py => uploads.py} (99%) diff --git a/telethon/client/messages.py b/telethon/client/messages.py index 1bb47878..d21d81e8 100644 --- a/telethon/client/messages.py +++ b/telethon/client/messages.py @@ -5,14 +5,14 @@ import time import warnings from collections import UserList -from .files import FileMethods +from .uploads import UploadMethods from .. import utils from ..tl import types, functions, custom __log__ = logging.getLogger(__name__) -class MessageMethods(FileMethods): +class MessageMethods(UploadMethods): # region Public methods diff --git a/telethon/client/telegrambaseclient.py b/telethon/client/telegrambaseclient.py index 40ae78eb..2e76cddd 100644 --- a/telethon/client/telegrambaseclient.py +++ b/telethon/client/telegrambaseclient.py @@ -1,18 +1,16 @@ import abc -import asyncio -import itertools import logging import platform import warnings from datetime import timedelta, datetime -from .. import version, errors, utils +from .. import version from ..crypto import rsa from ..extensions import markdown from ..network import MTProtoSender, ConnectionTcpFull from ..network.mtprotostate import MTProtoState from ..sessions import Session, SQLiteSession -from ..tl import TLObject, types, functions +from ..tl import TLObject, functions from ..tl.all_tlobjects import LAYER from ..update_state import UpdateState diff --git a/telethon/client/telegramclient.py b/telethon/client/telegramclient.py index 5c90a8e4..084fce13 100644 --- a/telethon/client/telegramclient.py +++ b/telethon/client/telegramclient.py @@ -21,12 +21,6 @@ try: except ImportError: socks = None -try: - import hachoir - import hachoir.metadata - import hachoir.parser -except ImportError: - hachoir = None from .telegrambaseclient import TelegramBaseClient from .. import helpers, events diff --git a/telethon/client/files.py b/telethon/client/uploads.py similarity index 99% rename from telethon/client/files.py rename to telethon/client/uploads.py index 974c4703..3cf9ec0d 100644 --- a/telethon/client/files.py +++ b/telethon/client/uploads.py @@ -15,13 +15,15 @@ from ..tl import types, functions, custom try: import hachoir + import hachoir.metadata + import hachoir.parser except ImportError: hachoir = None __log__ = logging.getLogger(__name__) -class FileMethods(UserMethods): +class UploadMethods(UserMethods): # region Public methods