diff --git a/DrissionPage/driver_element.py b/DrissionPage/driver_element.py index 37b98ff..df061db 100644 --- a/DrissionPage/driver_element.py +++ b/DrissionPage/driver_element.py @@ -109,7 +109,11 @@ class DriverElement(DrissionElement): # return self.attrs[attr] return self.inner_ele.get_attribute(attr) - def ele(self, loc_or_str: Union[tuple, str], mode: str = None, show_errmsg: bool = False, timeout: float = None): + def ele(self, + loc_or_str: Union[tuple, str], + mode: str = None, + show_errmsg: bool = False, + timeout: float = None): """根据loc获取元素或列表,可用用字符串控制获取方式,可选'id','class','name','tagName' 例:ele.find('id:ele_id') """ @@ -128,7 +132,10 @@ class DriverElement(DrissionElement): timeout = timeout or self.timeout return execute_driver_find(self.inner_ele, loc_or_str, mode, show_errmsg, timeout) - def eles(self, loc_or_str: Union[tuple, str], show_errmsg: bool = False, timeout: float = None): + def eles(self, + loc_or_str: Union[tuple, str], + show_errmsg: bool = False, + timeout: float = None): """根据loc获取子元素列表""" return self.ele(loc_or_str, mode='all', show_errmsg=show_errmsg, timeout=timeout) @@ -262,8 +269,11 @@ class DriverElement(DrissionElement): ActionChains(self._driver).move_to_element(self.inner_ele).perform() -def execute_driver_find(page_or_ele: Union[WebElement, WebDriver], loc: tuple, mode: str = 'single', - show_errmsg: bool = False, timeout: float = 10) -> Union[DriverElement, List[DriverElement]]: +def execute_driver_find(page_or_ele: Union[WebElement, WebDriver], + loc: tuple, + mode: str = 'single', + show_errmsg: bool = False, + timeout: float = 10) -> Union[DriverElement, List[DriverElement]]: """执行driver模式元素的查找 页面查找元素及元素查找下级元素皆使用此方法 :param page_or_ele: driver模式页面或元素 diff --git a/DrissionPage/session_element.py b/DrissionPage/session_element.py index 2192b56..3feff94 100644 --- a/DrissionPage/session_element.py +++ b/DrissionPage/session_element.py @@ -147,8 +147,10 @@ class SessionElement(DrissionElement): return '' -def execute_session_find(page_or_ele: BaseParser, loc: tuple, mode: str = 'single', show_errmsg: bool = False) \ - -> Union[SessionElement, List[SessionElement]]: +def execute_session_find(page_or_ele: BaseParser, + loc: tuple, + mode: str = 'single', + show_errmsg: bool = False) -> Union[SessionElement, List[SessionElement]]: """执行session模式元素的查找 页面查找元素及元素查找下级元素皆使用此方法 :param page_or_ele: session模式页面或元素 diff --git a/DrissionPage/session_page.py b/DrissionPage/session_page.py index e24e46c..c0d3ea4 100644 --- a/DrissionPage/session_page.py +++ b/DrissionPage/session_page.py @@ -63,8 +63,10 @@ class SessionPage(object): """获取元素innerHTML,如未指定元素则获取所有源代码""" return self.response.html.html - def ele(self, loc_or_ele: Union[tuple, str, SessionElement], mode: str = None, show_errmsg: bool = False) \ - -> Union[SessionElement, List[SessionElement], None]: + def ele(self, + loc_or_ele: Union[tuple, str, SessionElement], + mode: str = None, + show_errmsg: bool = False) -> Union[SessionElement, List[SessionElement], None]: """查找一个元素 :param loc_or_ele: 页面元素地址 :param mode: 以某种方式查找元素,可选'single','all' @@ -108,7 +110,11 @@ class SessionPage(object): self._url_available = True if self._response and self._response.status_code == 200 else False return self._url_available - def download(self, file_url: str, goal_path: str = None, rename: str = None, show_msg: bool = False, + def download(self, + file_url: str, + goal_path: str = None, + rename: str = None, + show_msg: bool = False, **kwargs) -> tuple: """下载一个文件 生成的response不写入self._response,是临时的