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

增加wait.new_tab()；修复cookie解析的一个问题

Browse Source
This commit is contained in:
g1879 2023-03-22 22:50:04 +08:00
parent 202154dbf7
commit 7dc8650b37
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DrissionPage/chromium_base.py
View File

@ -42,8 +42,8 @@ class ChromiumBase(BasePage):
self._set = None self._set = None
self._screencast = None self._screencast = None
if isinstance(address, int) or address.isdigit(): if address and (isinstance(address, int) or address.isdigit()):
address = f'localhost:{address}' address = f'127.0.0.1:{address}'
self._set_start_options(address, None) self._set_start_options(address, None)
self._set_runtime_settings() self._set_runtime_settings()

12
DrissionPage/chromium_page.py
View File

@ -399,6 +399,16 @@ class ChromiumPageWaiter(ChromiumBaseWaiter):
""" """
return self._driver.download_set.wait_download_begin(timeout) return self._driver.download_set.wait_download_begin(timeout)
def new_tab(self, timeout=None):
"""等待新标签页出现
:param timeout: 等待超时时间，为None则使用页面对象timeout属性
:return: 是否等到下载开始
"""
timeout = timeout if timeout is not None else self._driver.timeout
end_time = perf_counter() + timeout
while self._driver.tab_id == self._driver.latest_tab and perf_counter() < end_time:
sleep(.01)
class ChromiumTabRect(object): class ChromiumTabRect(object):
def __init__(self, page): def __init__(self, page):
@ -721,7 +731,7 @@ def show_or_hide_browser(page, hide=True):
:param hide: 是否隐藏 :param hide: 是否隐藏
:return: None :return: None
""" """
if not page.address.startswith(('localhost', '127.0.0.1')): if not page.address.startswith(('127.0.0.1', 'localhost')):
return return
if system().lower() != 'windows': if system().lower() != 'windows':

2
DrissionPage/chromium_page.pyi
View File

@ -111,6 +111,8 @@ class ChromiumPageWaiter(ChromiumBaseWaiter):
def download_begin(self, timeout: float = None) -> bool: ... def download_begin(self, timeout: float = None) -> bool: ...
def new_tab(self, timeout: float = None) -> bool: ...
class ChromiumTabRect(object): class ChromiumTabRect(object):
def __init__(self, page: ChromiumPage): def __init__(self, page: ChromiumPage):

2
DrissionPage/commons/web.py
View File

@ -183,7 +183,7 @@ def cookie_to_dict(cookie):
cookie_dict = {} cookie_dict = {}
for key, attr in enumerate(cookie): for key, attr in enumerate(cookie):
attr_val = attr.lstrip().split('=') attr_val = attr.lstrip().split('=', 1)
if key == 0: if key == 0:
cookie_dict['name'] = attr_val[0] cookie_dict['name'] = attr_val[0]