From adb1952d9fc847b087542e565c22d0d7068b7df5 Mon Sep 17 00:00:00 2001 From: g1879 Date: Fri, 1 Jan 2021 01:03:27 +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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DrissionPage/driver_element.py b/DrissionPage/driver_element.py index 8622bfe..e4999ed 100644 --- a/DrissionPage/driver_element.py +++ b/DrissionPage/driver_element.py @@ -596,7 +596,7 @@ def execute_driver_find(page_or_ele, return wait.until(ElementsByXpath(page, loc[1], mode, timeout)) else: return ElementsByXpath(page, loc[1], mode, timeout)(driver) - else: + else: # 用css获取 if mode == 'single': if timeout: return DriverElement(wait.until(ec.presence_of_element_located(loc)), page) @@ -605,6 +605,7 @@ def execute_driver_find(page_or_ele, return DriverElement(driver.find_element_by_css_selector(loc[1]), page) except: return None + elif mode == 'all': if timeout: eles = wait.until(ec.presence_of_all_elements_located(loc)) @@ -616,7 +617,6 @@ def execute_driver_find(page_or_ele, except: return [] - except TimeoutException: return [] if mode == 'all' else None