From b160ebaf8fe5fb79d8d3cae95efd00115833fb93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=A1=9C?= Date: Thu, 6 Apr 2023 11:11:18 +0900 Subject: [PATCH] Change html parser --- comcigan/async_school.py | 19 +++++++++---------- comcigan/school.py | 2 +- setup.py | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/comcigan/async_school.py b/comcigan/async_school.py index 41bc9e7..e8c4280 100644 --- a/comcigan/async_school.py +++ b/comcigan/async_school.py @@ -1,24 +1,23 @@ -from typing import List, Tuple - from base64 import b64encode from json import loads +from typing import List, Tuple from aiohttp import ClientSession from bs4 import BeautifulSoup from .reg import ( - routereg, - prefixreg, - orgdatareg, daydatareg, - thnamereg, - sbnamereg, - regsearch, extractint, + orgdatareg, + prefixreg, + regsearch, + routereg, + sbnamereg, + thnamereg, ) -async def AsyncRequest(url: str, encoding: str = None): +async def AsyncRequest(url: str, encoding: str | None = None): async with ClientSession() as sess: async with sess.get(url) as res: return await res.text(encoding) @@ -39,7 +38,7 @@ class CONSTANT: async def refresh(self): comci_resp = await AsyncRequest(f"{URL}/st") - comcigan_html = BeautifulSoup(comci_resp, "html.parser") + comcigan_html = BeautifulSoup(comci_resp, "lxml") script = comcigan_html.find_all("script")[1].contents[0] route = regsearch(routereg, script) diff --git a/comcigan/school.py b/comcigan/school.py index ec49d18..b4dd2a8 100644 --- a/comcigan/school.py +++ b/comcigan/school.py @@ -28,7 +28,7 @@ def trim(lis): comci_resp = get(f"{URL}/st") comci_resp.encoding = "EUC-KR" -comcigan_html = BeautifulSoup(comci_resp.text, "html.parser") +comcigan_html = BeautifulSoup(comci_resp.text, "lxml") script = comcigan_html.find_all("script")[1].contents[0] route = regsearch(routereg, script) diff --git a/setup.py b/setup.py index 1f65699..34fa9a0 100644 --- a/setup.py +++ b/setup.py @@ -11,8 +11,8 @@ setup( name="comcigan", version=version, - author="Team IF", - author_email="Coder-Iro@teamif.io", + author="Coder-Iro", + author_email="doohee006@gmail.com", description="Unofficial Comcigan API python wrapper", long_description=open("README.md", "r", encoding="UTF-8").read(), long_description_content_type="text/markdown",