From 267a4defa918647e498e5c3601a3566ab45a51eb Mon Sep 17 00:00:00 2001 From: Fatpandac <1779196284@qq.com> Date: Tue, 31 May 2022 18:29:52 +0800 Subject: [PATCH] fix(module): remove get avatar (#15) --- sample.py | 2 +- src/core.py | 3 --- src/user.py | 8 -------- tests/test_core.py | 1 - tests/test_request.py | 16 ---------------- tests/test_user.py | 9 --------- 6 files changed, 1 insertion(+), 38 deletions(-) diff --git a/sample.py b/sample.py index a2bdffe..01e88a8 100644 --- a/sample.py +++ b/sample.py @@ -23,7 +23,7 @@ def print_green_sentence(sentence): def main(): # Step 1, init object print_red_sentence("\nStep 1, init object") - print_green_sentence("core = Core(username, password)") + print_green_sentence(f"core = Core({username}, {password})") core = Core(username, password) # Stpe 2 diff --git a/src/core.py b/src/core.py index 4e58b5f..c5514fb 100644 --- a/src/core.py +++ b/src/core.py @@ -26,9 +26,6 @@ def __process_user_info(self) -> None: info_res = self.__request.do_get(self.__api_url.info_api()) info_data = info_res.json() self.__user.set_name(info_data["name"]) - self.__user.set_avatar( - self.__request.get_host() + info_data["headimgurl"] - ) def login(self) -> dict: api = self.__api_url.get_nonce_api() diff --git a/src/user.py b/src/user.py index 321cafc..3a70fbb 100644 --- a/src/user.py +++ b/src/user.py @@ -6,7 +6,6 @@ class User: __username = None __pwd = None __name = None - __avatar = None __course_data = None __lessons_data = None __mcs_id = None @@ -45,12 +44,6 @@ def set_name(self, name: str) -> None: def get_name(self) -> str: return self.__name - def set_avatar(self, avatar: str) -> None: - self.__avatar = avatar - - def get_avatar(self) -> str: - return self.__avatar - def set_course_data(self, course_data: dict) -> None: self.__course_data = course_data @@ -76,7 +69,6 @@ def get_info(self) -> dict: "username": self.__username, "pwd": self.__pwd, "name": self.__name, - "avatar": self.__avatar, "mcs_id": self.__mcs_id, "course_data": self.__course_data, "lessons_data": self.__lessons_data, diff --git a/tests/test_core.py b/tests/test_core.py index a680fa2..924fbbc 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -37,7 +37,6 @@ def test_get_info(): assert res["xsid"] is None assert res["id"] is None assert res["name"] is None - assert res["avatar"] is None def test_get_course(): diff --git a/tests/test_request.py b/tests/test_request.py index 11c92af..92dc066 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -57,19 +57,3 @@ def test_do_get(): }, ) assert res.status_code == 200 - - -def test_do_post(): - request = Request() - res = request.do_post( - "https://sm.ms/api/v2", - headers={ - "User-Agent": ua, - }, - proxies={ - "http": "http://127.0.0.1:8889", - "https": "http://127.0.0.1:8889", - }, - ) - print(res.request.headers) - assert res.status_code == 200 diff --git a/tests/test_user.py b/tests/test_user.py index 7ed52b8..b34fd9b 100644 --- a/tests/test_user.py +++ b/tests/test_user.py @@ -6,7 +6,6 @@ username = "122132421" pwd = "123456" name = "asad" -avatar = "/saad" course_data = {"test"} lessons_data = {"test"} @@ -47,12 +46,6 @@ def test_get_and_set_name(): assert user.get_name() == name -def test_get_and_set_avatar(): - user = User(username, pwd) - user.set_avatar(avatar) - assert user.get_avatar() == avatar - - def test_get_and_set_course_data(): user = User(username, pwd) user.set_course_data(course_data) @@ -76,7 +69,6 @@ def test_get_info(): user.set_xsid(xsid) user.set_id(id) user.set_name(name) - user.set_avatar(avatar) user.set_course_data(course_data) user.set_lessons_data(lessons_data) info = user.get_info() @@ -85,6 +77,5 @@ def test_get_info(): assert info["username"] == username assert info["pwd"] == pwd assert info["name"] == name - assert info["avatar"] == avatar assert info["course_data"] == course_data assert info["lessons_data"] == lessons_data