diff --git a/DrissionPage/driver_element.py b/DrissionPage/driver_element.py index e4999ed..46d1443 100644 --- a/DrissionPage/driver_element.py +++ b/DrissionPage/driver_element.py @@ -585,7 +585,7 @@ def execute_driver_find(page_or_ele, driver = page_or_ele.driver try: - if timeout and timeout != page.timeout: + if timeout is not None and timeout != page.timeout: wait = WebDriverWait(driver, timeout=timeout) else: page.wait._driver = driver diff --git a/DrissionPage/driver_page.py b/DrissionPage/driver_page.py index 874179f..871a900 100644 --- a/DrissionPage/driver_page.py +++ b/DrissionPage/driver_page.py @@ -199,7 +199,7 @@ class DriverPage(object): else: raise ValueError('Argument loc_or_str can only be tuple, str, DriverElement, DriverElement.') - timeout = timeout or self.timeout + timeout = timeout if timeout is not None else self.timeout return execute_driver_find(self, loc_or_ele, mode, timeout) def eles(self, diff --git a/DrissionPage/mix_page.py b/DrissionPage/mix_page.py index 9961281..0336f21 100644 --- a/DrissionPage/mix_page.py +++ b/DrissionPage/mix_page.py @@ -379,7 +379,7 @@ class MixPage(Null, SessionPage, DriverPage): if self._mode == 's': return super().ele(loc_or_ele, mode=mode) elif self._mode == 'd': - timeout = timeout or self.timeout + timeout = timeout if timeout is not None else self.timeout return super(SessionPage, self).ele(loc_or_ele, mode=mode, timeout=timeout) def eles(self,