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模式下xpath中带有回车等特殊字符时出错的问题

Browse Source
This commit is contained in:
g1879 2021-01-08 08:54:03 +08:00
parent 1649d8a3b6
commit 4d1b8e5109
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DrissionPage/driver_element.py
View File

@ -5,7 +5,6 @@
@File : driver_element.py @File : driver_element.py
""" """
from pathlib import Path from pathlib import Path
from time import sleep
from typing import Union, List, Any, Tuple from typing import Union, List, Any, Tuple
from selenium.common.exceptions import TimeoutException, JavascriptException, InvalidElementStateException from selenium.common.exceptions import TimeoutException, JavascriptException, InvalidElementStateException
@ -13,6 +12,7 @@ from selenium.webdriver.chrome.webdriver import WebDriver
from selenium.webdriver.remote.webelement import WebElement from selenium.webdriver.remote.webelement import WebElement
from selenium.webdriver.support import expected_conditions as ec from selenium.webdriver.support import expected_conditions as ec
from selenium.webdriver.support.wait import WebDriverWait from selenium.webdriver.support.wait import WebDriverWait
from time import sleep
from .common import DrissionElement, str_to_loc, get_available_file_name, translate_loc, format_html from .common import DrissionElement, str_to_loc, get_available_file_name, translate_loc, format_html
@ -541,7 +541,6 @@ class DriverElement(DrissionElement):
sib = sib.previousSibling; sib = sib.previousSibling;
} }
''' + txt4 + ''' ''' + txt4 + '''
el = el.parentNode; el = el.parentNode;
} }
''' + txt5 + ''' ''' + txt5 + '''
@ -611,6 +610,7 @@ def execute_driver_find(page_or_ele,
page = page_or_ele page = page_or_ele
driver = page_or_ele.driver driver = page_or_ele.driver
# 设置等待对象
if timeout is not None and timeout != page.timeout: if timeout is not None and timeout != page.timeout:
wait = WebDriverWait(driver, timeout=timeout) wait = WebDriverWait(driver, timeout=timeout)
else: else:
@ -618,9 +618,12 @@ def execute_driver_find(page_or_ele,
wait = page.wait wait = page.wait
try: try:
# 使用xpath查找
if loc[0] == 'xpath': if loc[0] == 'xpath':
return wait.until(ElementsByXpath(page, loc[1], mode, timeout)) return wait.until(ElementsByXpath(page, loc[1], mode, timeout))
else: # 使用css selector查找
# 使用css selector查找
else:
if mode == 'single': if mode == 'single':
return DriverElement(wait.until(ec.presence_of_element_located(loc)), page) return DriverElement(wait.until(ec.presence_of_element_located(loc)), page)
elif mode == 'all': elif mode == 'all':
@ -692,11 +695,11 @@ class ElementsByXpath(object):
return_txt = 'return e.singleNodeValue;' return_txt = 'return e.singleNodeValue;'
js = """ js = """
var e=document.evaluate('""" + xpath_txt + """', """ + node_txt + """, null, """ + type_txt + """,null); var e=document.evaluate(arguments[1], """ + node_txt + """, null, """ + type_txt + """,null);
""" + for_txt + """ """ + for_txt + """
""" + return_txt + """ """ + return_txt + """
""" """
return driver.execute_script(js, node) return driver.execute_script(js, node, xpath_txt)
if isinstance(ele_or_driver, WebDriver): if isinstance(ele_or_driver, WebDriver):
driver, the_node = ele_or_driver, 'document' driver, the_node = ele_or_driver, 'document'