From b64db1c43db7ca3dbaaf3bc31ddc2c173ee905a8 Mon Sep 17 00:00:00 2001 From: g1879 Date: Wed, 1 Feb 2023 17:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DrissionPage/chromium_element.pyi | 5 ++--- DrissionPage/chromium_page.py | 1 + DrissionPage/session_element.py | 8 ++++---- DrissionPage/session_element.pyi | 8 ++++---- DrissionPage/session_page.py | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/DrissionPage/chromium_element.pyi b/DrissionPage/chromium_element.pyi index 3905e66..c881bed 100644 --- a/DrissionPage/chromium_element.pyi +++ b/DrissionPage/chromium_element.pyi @@ -211,12 +211,11 @@ class ChromiumElement(DrissionElement): def click(self, by_js: bool = None, retry: bool = False, timeout: float = 0.2, wait_loading: Union[bool, float] = 0) -> bool: ... - def click_at(self, offset_x: Union[int, str] = None, offset_y: Union[int, str] = None, - button: str = 'left') -> None: ... + def click_at(self, offset_x: int = None, offset_y: int = None, button: str = 'left') -> None: ... def r_click(self) -> None: ... - def r_click_at(self, offset_x: Union[int, str] = None, offset_y: Union[int, str] = None) -> None: ... + def r_click_at(self, offset_x: int = None, offset_y: int = None) -> None: ... def m_click(self) -> None: ... diff --git a/DrissionPage/chromium_page.py b/DrissionPage/chromium_page.py index a178b33..21817ad 100644 --- a/DrissionPage/chromium_page.py +++ b/DrissionPage/chromium_page.py @@ -350,6 +350,7 @@ class ChromiumPage(ChromiumBase): :return: 提示框内容文本，未等到提示框则返回None """ timeout = timeout or self.timeout + timeout = .1 if timeout <= 0 else timeout end_time = perf_counter() + timeout while not self._alert.activated and perf_counter() < end_time: sleep(.1) diff --git a/DrissionPage/session_element.py b/DrissionPage/session_element.py index cce9e77..28127f1 100644 --- a/DrissionPage/session_element.py +++ b/DrissionPage/session_element.py @@ -81,7 +81,7 @@ class SessionElement(DrissionElement): """ return super().parent(level_or_loc) - def prev(self, filter_loc='', index=1, timeout=0): + def prev(self, filter_loc='', index=1, timeout=None): """返回前面的一个兄弟元素，可用查询语法筛选，可指定返回筛选结果的第几个 :param filter_loc: 用于筛选元素的查询语法 :param index: 前面第几个查询结果元素 @@ -90,7 +90,7 @@ class SessionElement(DrissionElement): """ return super().prev(index, filter_loc, timeout) - def next(self, filter_loc='', index=1, timeout=0): + def next(self, filter_loc='', index=1, timeout=None): """返回后面的一个兄弟元素，可用查询语法筛选，可指定返回筛选结果的第几个 :param filter_loc: 用于筛选元素的查询语法 :param index: 后面第几个查询结果元素 @@ -117,7 +117,7 @@ class SessionElement(DrissionElement): """ return super().after(index, filter_loc, timeout) - def prevs(self, filter_loc='', timeout=0): + def prevs(self, filter_loc='', timeout=None): """返回前面全部兄弟元素或节点组成的列表，可用查询语法筛选 :param filter_loc: 用于筛选元素的查询语法 :param timeout: 查找元素的超时时间 @@ -125,7 +125,7 @@ class SessionElement(DrissionElement): """ return super().prevs(filter_loc, timeout) - def nexts(self, filter_loc='', timeout=0): + def nexts(self, filter_loc='', timeout=None): """返回后面全部兄弟元素或节点组成的列表，可用查询语法筛选 :param filter_loc: 用于筛选元素的查询语法 :param timeout: 查找元素的超时时间 diff --git a/DrissionPage/session_element.pyi b/DrissionPage/session_element.pyi index c33496b..f45c060 100644 --- a/DrissionPage/session_element.pyi +++ b/DrissionPage/session_element.pyi @@ -54,12 +54,12 @@ class SessionElement(DrissionElement): def prev(self, filter_loc: Union[tuple, str] = '', index: int = 1, - timeout: float = 0) -> Union['SessionElement', str, None]: ... + timeout: float = None) -> Union['SessionElement', str, None]: ... def next(self, filter_loc: Union[tuple, str] = '', index: int = 1, - timeout: float = 0) -> Union['SessionElement', str, None]: ... + timeout: float = None) -> Union['SessionElement', str, None]: ... def before(self, filter_loc: Union[tuple, str] = '', @@ -73,11 +73,11 @@ class SessionElement(DrissionElement): def prevs(self, filter_loc: Union[tuple, str] = '', - timeout: float = 0) -> List[Union['SessionElement', str]]: ... + timeout: float = None) -> List[Union['SessionElement', str]]: ... def nexts(self, filter_loc: Union[tuple, str] = '', - timeout: float = 0) -> List[Union['SessionElement', str]]: ... + timeout: float = None) -> List[Union['SessionElement', str]]: ... def befores(self, filter_loc: Union[tuple, str] = '', diff --git a/DrissionPage/session_page.py b/DrissionPage/session_page.py index 04dc91e..83c6f8e 100644 --- a/DrissionPage/session_page.py +++ b/DrissionPage/session_page.py @@ -94,7 +94,7 @@ class SessionPage(BasePage): """在内部查找元素 例：ele2 = ele1('@id=ele_id') :param loc_or_str: 元素的定位信息，可以是loc元组，或查询字符串 - :param timeout: 不起实际作用，用于和DriverElement对应，便于无差别调用 + :param timeout: 不起实际作用，用于和ChromiumElement对应，便于无差别调用 :return: SessionElement对象或属性文本 """ return self.ele(loc_or_str) @@ -160,7 +160,7 @@ class SessionPage(BasePage): def ele(self, loc_or_ele, timeout=None): """返回页面中符合条件的第一个元素、属性或节点文本 :param loc_or_ele: 元素的定位信息，可以是元素对象，loc元组，或查询字符串 - :param timeout: 不起实际作用，用于和DriverElement对应，便于无差别调用 + :param timeout: 不起实际作用，用于和ChromiumElement对应，便于无差别调用 :return: SessionElement对象或属性、文本 """ return self._ele(loc_or_ele) @@ -168,7 +168,7 @@ class SessionPage(BasePage): def eles(self, loc_or_str, timeout=None): """返回页面中所有符合条件的元素、属性或节点文本 :param loc_or_str: 元素的定位信息，可以是loc元组，或查询字符串 - :param timeout: 不起实际作用，用于和DriverElement对应，便于无差别调用 + :param timeout: 不起实际作用，用于和ChromiumElement对应，便于无差别调用 :return: SessionElement对象或属性、文本组成的列表 """ return self._ele(loc_or_str, single=False)