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

完善对xpath获取数字结果的支持

Browse Source
This commit is contained in:
g1879 2020-12-29 23:07:29 +08:00
parent 88f22bad84
commit 7f6285f3cd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DrissionPage/driver_element.py
View File

@ -627,7 +627,7 @@ class ElementsByXpath(object):
"""用js通过xpath获取元素、节点或属性 """用js通过xpath获取元素、节点或属性
:param node: 'document' 或 元素对象 :param node: 'document' 或 元素对象
:param xpath_txt: xpath语句 :param xpath_txt: xpath语句
:param type_txt: resultType,参考https://developer.mozilla.org/zh-CN/docs/Web/API/Document/evaluate :param type_txt: resultType,参考 https://developer.mozilla.org/zh-CN/docs/Web/API/Document/evaluate
:return: 元素对象或属性、文本字符串 :return: 元素对象或属性、文本字符串
""" """
node_txt = 'document' if not node or node == 'document' else 'arguments[0]' node_txt = 'document' if not node or node == 'document' else 'arguments[0]'
@ -685,8 +685,14 @@ class ElementsByXpath(object):
return e return e
# 找不到目标时 # 找不到目标时
except JavascriptException: except JavascriptException as err:
return None if 'The result is not a node set' in err.msg:
try:
return get_nodes(the_node, xpath_txt=self.xpath, type_txt='1')
except JavascriptException:
return None
else:
return None
elif self.mode == 'all': elif self.mode == 'all':
return ([DriverElement(x, self.page) if isinstance(x, WebElement) return ([DriverElement(x, self.page) if isinstance(x, WebElement)