blackteay/DrissionPage
1
0
Fork 0
mirror of https://gitee.com/g1879/DrissionPage.git synced 2024-12-10 04:00:23 +08:00
Code Issues Projects Releases Wiki Activity

d模式查找元素timeout支持0秒

Browse Source
This commit is contained in:
g1879 2021-01-01 01:03:27 +08:00
parent 5a21481c33
commit adb1952d9f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DrissionPage/driver_element.py
View File

@ -596,7 +596,7 @@ def execute_driver_find(page_or_ele,
return wait.until(ElementsByXpath(page, loc[1], mode, timeout)) return wait.until(ElementsByXpath(page, loc[1], mode, timeout))
else: else:
return ElementsByXpath(page, loc[1], mode, timeout)(driver) return ElementsByXpath(page, loc[1], mode, timeout)(driver)
else: else: # 用css获取
if mode == 'single': if mode == 'single':
if timeout: if timeout:
return DriverElement(wait.until(ec.presence_of_element_located(loc)), page) 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) return DriverElement(driver.find_element_by_css_selector(loc[1]), page)
except: except:
return None return None
elif mode == 'all': elif mode == 'all':
if timeout: if timeout:
eles = wait.until(ec.presence_of_all_elements_located(loc)) eles = wait.until(ec.presence_of_all_elements_located(loc))
@ -616,7 +617,6 @@ def execute_driver_find(page_or_ele,
except: except:
return [] return []
except TimeoutException: except TimeoutException:
return [] if mode == 'all' else None return [] if mode == 'all' else None