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-11-02 23:11:46 +08:00
parent fb600a6596
commit f235178b36
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DrissionPage/driver_page.py
View File

@ -138,13 +138,10 @@ class DriverPage(object):
:param show_errmsg: 出现异常时是否打印信息
:return: DriverElement对象
"""
if isinstance(loc_or_ele, str):
loc_or_ele = get_loc_from_str(loc_or_ele)
if loc_or_ele[0] == 'xpath' and not loc_or_ele[1].startswith('/'):
loc_or_ele = 'xpath', f'//{loc_or_ele[1]}'
elif isinstance(loc_or_ele, tuple) and len(loc_or_ele) == 2:
if loc_or_ele[0] == 'xpath' and not loc_or_ele[1].startswith('/'):
loc_or_ele = 'xpath', f'//{loc_or_ele[1]}'
if isinstance(loc_or_ele, (str, tuple)):
loc_or_ele = get_loc_from_str(loc_or_ele) if isinstance(loc_or_ele, str) else loc_or_ele
if loc_or_ele[0] == 'xpath' and not loc_or_ele[1].startswith(('/', '(')):
loc_or_ele = loc_or_ele[0], f'//{loc_or_ele[1]}'
elif isinstance(loc_or_ele, DriverElement):
return loc_or_ele
elif isinstance(loc_or_ele, WebElement):

13
DrissionPage/session_page.py
View File

@ -99,14 +99,11 @@ class SessionPage(object):
:param show_errmsg: 出现异常时是否打印信息
:return: SessionElement对象
"""
if isinstance(loc_or_ele, str):
loc_or_ele = get_loc_from_str(loc_or_ele)
if loc_or_ele[0] == 'xpath' and not loc_or_ele[1].startswith('/'):
loc_or_ele = 'xpath', f'//{loc_or_ele[1]}'
elif isinstance(loc_or_ele, tuple) and len(loc_or_ele) == 2:
loc_or_ele = translate_loc_to_xpath(loc_or_ele)
if loc_or_ele[0] == 'xpath' and not loc_or_ele[1].startswith('/'):
loc_or_ele = 'xpath', f'//{loc_or_ele[1]}'
if isinstance(loc_or_ele, (str, tuple)):
loc_or_ele = get_loc_from_str(loc_or_ele) if isinstance(loc_or_ele, str) \
else translate_loc_to_xpath(loc_or_ele)
if loc_or_ele[0] == 'xpath' and not loc_or_ele[1].startswith(('/', '(')):
loc_or_ele = loc_or_ele[0], f'//{loc_or_ele[1]}'
elif isinstance(loc_or_ele, SessionElement):
return loc_or_ele
elif isinstance(loc_or_ele, Element):