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

4.1.0.4修复Chromium对象设置NoneElement_value无效的问题；修复@tx()=定位不是最底层元素问题

Browse Source
This commit is contained in:
g1879 2024-09-20 20:52:16 +08:00
parent 4c427042e3
commit 89c5dfbacf
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DrissionPage/__init__.py
View File

@ -12,4 +12,4 @@ from ._pages.chromium_page import ChromiumPage
from ._pages.session_page import SessionPage from ._pages.session_page import SessionPage
from ._pages.web_page import WebPage from ._pages.web_page import WebPage
__version__ = '4.1.0.3' __version__ = '4.1.0.4'

2
DrissionPage/_base/chromium.py
View File

@ -72,6 +72,8 @@ class Chromium(object):
self._load_mode = self._chromium_options.load_mode self._load_mode = self._chromium_options.load_mode
self._download_path = str(Path(self._chromium_options.download_path).absolute()) self._download_path = str(Path(self._chromium_options.download_path).absolute())
self._auto_handle_alert = None self._auto_handle_alert = None
self._none_ele_return_value = False
self._none_ele_value = None
self.retry_times = self._chromium_options.retry_times self.retry_times = self._chromium_options.retry_times
self.retry_interval = self._chromium_options.retry_interval self.retry_interval = self._chromium_options.retry_interval
self.address = self._chromium_options.address self.address = self._chromium_options.address

4
DrissionPage/_base/chromium.pyi
View File

@ -6,7 +6,7 @@
@License : BSD 3-Clause. @License : BSD 3-Clause.
""" """
from threading import Lock from threading import Lock
from typing import List, Optional, Set, Dict, Union, Tuple, Literal from typing import List, Optional, Set, Dict, Union, Tuple, Literal, Any
from .driver import BrowserDriver, Driver from .driver import BrowserDriver, Driver
from .._configs.chromium_options import ChromiumOptions from .._configs.chromium_options import ChromiumOptions
@ -49,6 +49,8 @@ class Chromium(object):
_is_exists: bool = ... _is_exists: bool = ...
_is_headless: bool = ... _is_headless: bool = ...
_disconnect_flag: bool = ... _disconnect_flag: bool = ...
_none_ele_return_value: bool = ...
_none_ele_value: Any = ...
def __new__(cls, def __new__(cls,
addr_or_opts: Union[str, int, ChromiumOptions] = None, addr_or_opts: Union[str, int, ChromiumOptions] = None,

2
DrissionPage/_functions/locator.py
View File

@ -225,7 +225,7 @@ def _make_single_xpath_str(tag: str, text: str) -> tuple:
else: else:
symbol = r[1] symbol = r[1]
if symbol == '=': # 精确查找 if symbol == '=': # 精确查找
arg = '.' if r[0] in ('@text()', '@tx()') else r[0] arg = 'text()' if r[0] in ('@text()', '@tx()') else r[0]
arg_str = f'{arg}={_make_search_str(r[2])}' arg_str = f'{arg}={_make_search_str(r[2])}'
elif symbol == '^': # 匹配开头 elif symbol == '^': # 匹配开头

2
DrissionPage/_pages/chromium_tab.py
View File

@ -47,6 +47,8 @@ class ChromiumTab(ChromiumBase):
self._load_mode = self.browser._load_mode self._load_mode = self.browser._load_mode
self._download_path = self.browser.download_path self._download_path = self.browser.download_path
self._auto_handle_alert = self.browser._auto_handle_alert self._auto_handle_alert = self.browser._auto_handle_alert
self._none_ele_return_value = self.browser._none_ele_return_value
self._none_ele_value = self.browser._none_ele_value
def close(self, others=False): def close(self, others=False):
self.browser.close_tabs(self.tab_id, others=others) self.browser.close_tabs(self.tab_id, others=others)