From 6421b43aa93d7062b3e167c9393888c5ecaf0573 Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Fri, 1 Jan 2021 01:20:18 +0800
Subject: [PATCH] =?UTF-8?q?d=E6=A8=A1=E5=BC=8F=E6=9F=A5=E6=89=BE=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0timeout=E6=94=AF=E6=8C=810=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/driver_element.py | 2 +-
 DrissionPage/driver_page.py    | 2 +-
 DrissionPage/mix_page.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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,