From a84c366449919c46ea044f20e7e3679b12278a07 Mon Sep 17 00:00:00 2001 From: g1879 Date: Sun, 22 Nov 2020 21:06:29 +0800 Subject: [PATCH] =?UTF-8?q?download()=E6=94=B9=E4=B8=BA=E5=BF=85=E9=A1=BB?= =?UTF-8?q?=E6=8E=A5=E6=94=B6goal=5Fpath=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BF=9D=E5=AD=98=E5=88=B0tmp=5Fpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DrissionPage/session_page.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/DrissionPage/session_page.py b/DrissionPage/session_page.py index a920d60..1779ee2 100644 --- a/DrissionPage/session_page.py +++ b/DrissionPage/session_page.py @@ -17,7 +17,6 @@ from urllib.parse import urlparse, quote, unquote from requests import Session, Response from .common import str_to_loc, translate_loc, get_available_file_name, format_html -from .config import OptionsManager from .session_element import SessionElement, execute_session_find @@ -267,7 +266,7 @@ class SessionPage(object): def download(self, file_url: str, - goal_path: str = None, + goal_path: str, rename: str = None, file_exists: str = 'rename', post_data: dict = None, @@ -286,20 +285,13 @@ class SessionPage(object): :return: 下载是否成功（bool）和状态信息（成功时信息为文件路径）的元组 """ # 生成的response不写入self._response，是临时的 - goal_path = goal_path or OptionsManager().get_value('paths', 'global_tmp_path') - - if not goal_path: - raise IOError('No path specified.') - kwargs['stream'] = True if 'timeout' not in kwargs: kwargs['timeout'] = 20 - if not post_data: - r, info = self._make_response(file_url, mode='get', show_errmsg=show_errmsg, **kwargs) - else: - r, info = self._make_response(file_url, mode='post', data=post_data, show_errmsg=show_errmsg, **kwargs) + mode = 'post' if post_data else 'get' + r, info = self._make_response(file_url, mode=mode, data=post_data, show_errmsg=show_errmsg, **kwargs) if r is None: if show_msg: