From e906fc8c3a447a34dedf8862e042f9483c7d8083 Mon Sep 17 00:00:00 2001 From: Davte Date: Tue, 28 May 2019 17:14:12 +0200 Subject: [PATCH] davteutil dependency removed since it is now included as submodule --- davtelepot/__init__.py | 4 ++-- davtelepot/admin_tools.py | 2 +- davtelepot/custombot.py | 8 +++++--- requirements.txt | 1 - setup.py | 1 - 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/davtelepot/__init__.py b/davtelepot/__init__.py index 852ca1e..f5ac16f 100644 --- a/davtelepot/__init__.py +++ b/davtelepot/__init__.py @@ -4,10 +4,10 @@ See custombot.py for information about Bot class. """ __author__ = "Davide Testa" -__email__ = "davte@libero.it" +__email__ = "davide@davte.it" __credits__ = "Marco Origlia" __license__ = "GNU General Public License v3.0" -__version__ = "1.5.2" +__version__ = "1.5.3" __maintainer__ = "Davide Testa" __contact__ = "t.me/davte" diff --git a/davtelepot/admin_tools.py b/davtelepot/admin_tools.py index dc2a46e..d3a433d 100644 --- a/davtelepot/admin_tools.py +++ b/davtelepot/admin_tools.py @@ -9,7 +9,7 @@ davtelepot.admin_tools.init(my_bot) """ # Third party modules -from davteutil.utilities import ( +from davtelepot.utilities import ( async_wrapper, Confirmator, get_cleaned_text, get_user, escape_html_chars, extract, line_drawing_unordered_list, make_button, make_inline_keyboard, remove_html_tags diff --git a/davtelepot/custombot.py b/davtelepot/custombot.py index bfdb290..eb662ab 100644 --- a/davtelepot/custombot.py +++ b/davtelepot/custombot.py @@ -23,13 +23,15 @@ import os # Third party modules import dataset -from davteutil.utilities import ( +import telepot +import telepot.aio + +# Project modules +from davtelepot.utilities import ( get_secure_key, Gettable, escape_html_chars, extract, line_drawing_unordered_list, make_lines_of_buttons, markdown_check, MyOD, pick_most_similar_from_list, remove_html_tags, sleep_until ) -import telepot -import telepot.aio def split_text_gracefully(text, limit, parse_mode): diff --git a/requirements.txt b/requirements.txt index 512551e..e1f78ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,6 @@ certifi==2018.10.15 chardet==3.0.4 cycler==0.10.0 dataset==1.1.0 -davteutil idna==2.7 idna-ssl==1.1.0 kiwisolver==1.0.1 diff --git a/setup.py b/setup.py index 0f7586b..ec0e4c5 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,6 @@ setuptools.setup( 'aiohttp>=3.4.4', 'bs4>=0.0.1', 'dataset>=1.1.0', - 'davteutil', 'telepot>=12.7' ], classifiers=[