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

去除cssselect依赖

Browse Source
This commit is contained in:
g1879 2020-12-07 14:39:31 +08:00
parent d557feb22f
commit 843bc7c420
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DrissionPage/session_element.py
View File

@ -8,8 +8,7 @@ import re
from typing import Union, List, Tuple from typing import Union, List, Tuple
from urllib.parse import urlparse, urljoin, urlunparse from urllib.parse import urlparse, urljoin, urlunparse
from cssselect import SelectorSyntaxError from lxml.etree import tostring
from lxml.etree import tostring, XPathEvalError
from lxml.html import HtmlElement, fromstring from lxml.html import HtmlElement, fromstring
from .common import DrissionElement, str_to_loc, translate_loc, format_html from .common import DrissionElement, str_to_loc, translate_loc, format_html
@ -383,8 +382,11 @@ def execute_session_find(page_or_ele,
elif mode == 'all': elif mode == 'all':
return [SessionElement(e, page) if isinstance(e, HtmlElement) else e for e in ele if e != '\n'] return [SessionElement(e, page) if isinstance(e, HtmlElement) else e for e in ele if e != '\n']
except XPathEvalError: except Exception as e:
raise SyntaxError(f'Invalid xpath syntax. {loc}')
except SelectorSyntaxError: if 'Invalid expression' in str(e):
raise SyntaxError(f'Invalid css selector syntax. {loc}') raise SyntaxError(f'Invalid xpath syntax. {loc}')
elif 'Expected selector' in str(e):
raise SyntaxError(f'Invalid css selector syntax. {loc}')
raise e