diff --git a/convert.py b/convert.py index 0357e5e..66c0227 100644 --- a/convert.py +++ b/convert.py @@ -22,7 +22,7 @@ def get_subjects(self): tree = ElementTree.fromstring(self.filename) root = tree - for subject in root.findall('subject'): + for subject in root.iter('subject'): name = subject.find("name").get("value") single_subject = {} diff --git a/everytime.py b/everytime.py index a84df62..5b2d8d3 100644 --- a/everytime.py +++ b/everytime.py @@ -14,25 +14,17 @@ def get_timetable(self, year, semester): url = 'https://everytime.kr/user/login' with requests.Session() as session: - index_page_res = session.post(url, data=payload) - - soup = BeautifulSoup(index_page_res.text, 'html.parser') - token = soup.find(id="userToken")["value"] - timetable_result = session.post("http://timetable.everytime.kr/ajax/timetable/wizard/getTableList", data={ "semester": semester, - "year": year, - "token": token + "year": year }) tree = ElementTree.fromstring(timetable_result.text) for target in tree.findall('table[@is_primary="1"]'): id = target.get('id') - table_xml = session.post("http://timetable.everytime.kr/ajax/timetable/wizard/getOneTable", data={ - "id": id, - "token": token + table_xml = session.post("https://everytime.kr/find/timetable/table", data={ + "id": id }) - result_xml = table_xml - + result_xml = table_xml.text - return result_xml.text \ No newline at end of file + return result_xml \ No newline at end of file