From 061f60c080e8fde0b3a90035aa33622887b1206e Mon Sep 17 00:00:00 2001 From: Benny Date: Sun, 23 Apr 2023 22:08:48 +0200 Subject: [PATCH] fix package bug --- requirements.txt | 6 +++--- setup.py | 2 +- yyets/__init__.py | 12 +++++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index ffa989515..7d3fa1e9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ requests==2.28.2 -pytelegrambotapi==4.10.0 -beautifulsoup4==4.12.0 +pytelegrambotapi==4.11.0 +beautifulsoup4==4.12.2 tgbot-ping==1.0.7 redis==4.5.4 apscheduler==3.10.1 pymongo==4.3.3 -tornado==6.2 +tornado==6.3 captcha==0.4 passlib==1.7.4 fakeredis==2.10.3 diff --git a/setup.py b/setup.py index fcc5c667f..0e257457d 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ EMAIL = "benny.think@gmail.com" AUTHOR = "BennyThink" REQUIRES_PYTHON = ">=3.6.0" -VERSION = "1.0.0" +VERSION = "1.0.1" # What packages are required for this module to be executed? REQUIRED = ["requests"] diff --git a/yyets/__init__.py b/yyets/__init__.py index bd5257bb2..b9eb368cf 100644 --- a/yyets/__init__.py +++ b/yyets/__init__.py @@ -14,13 +14,12 @@ logging.basicConfig( level=logging.INFO, - format='[%(asctime)s %(filename)s:%(lineno)d %(levelname).1s] %(message)s', - datefmt="%Y-%m-%d %H:%M:%S" + format="[%(asctime)s %(filename)s:%(lineno)d %(levelname).1s] %(message)s", + datefmt="%Y-%m-%d %H:%M:%S", ) class Resource: - def __init__(self): self.enname = None self.cnname = None @@ -39,9 +38,8 @@ def __init__(self, keyword: "str"): def search(self): data = requests.get(self.search_api).json() - for item in data["data"]: + for info in data["data"]: r = Resource() - info = item["data"]["info"] setattr(r, "list", self.fetch(info)) for k, v in info.items(): setattr(r, k, v) @@ -58,7 +56,7 @@ def __str__(self): return f"{self.keyword} - {self.search_api}" -if __name__ == '__main__': - ins = YYeTs("逃避") +if __name__ == "__main__": + ins = YYeTs("逃避可耻") for i in ins.result: print(i)