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

修复了元素ele()处理类似'./node()'、'./text()'失效的问题

Browse Source
This commit is contained in:
g1879 2020-10-22 18:20:20 +08:00
parent c1f3f51a14
commit caa205483c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DrissionPage/session_element.py
View File

@ -246,9 +246,11 @@ def execute_session_find(page_or_ele: BaseParser,
try: try:
ele = None ele = None
if loc_by == 'xpath': if loc_by == 'xpath':
if 'PyQuery' in str(type(page_or_ele.element)): # 从页面查找 if 'PyQuery' in str(type(page_or_ele.element)) or '()' in loc_str.split('[')[0]:
# 从页面查找。后面的条件是处理./node()、./text()等xpath语句时用的
ele = page_or_ele.xpath(loc_str) ele = page_or_ele.xpath(loc_str)
elif 'HtmlElement' in str(type(page_or_ele.element)): # 从元素查找 elif 'HtmlElement' in str(type(page_or_ele.element)):
# 从元素查找。Q_Q忘记了为什么要这样区分
elements = page_or_ele.element.xpath(loc_str) elements = page_or_ele.element.xpath(loc_str)
ele = [Element(element=e, url=page_or_ele.url) for e in elements] ele = [Element(element=e, url=page_or_ele.url) for e in elements]
else: # 用css selector获取 else: # 用css selector获取
@ -257,7 +259,7 @@ def execute_session_find(page_or_ele: BaseParser,
if mode == 'single': if mode == 'single':
return SessionElement(ele[0]) if ele else None return SessionElement(ele[0]) if ele else None
elif mode == 'all': elif mode == 'all':
return [SessionElement(e) for e in ele] return [SessionElement(e) if isinstance(e, Element) else e for e in ele]
except: except:
if show_errmsg: if show_errmsg:
print('Element(s) not found.', loc) print('Element(s) not found.', loc)