mirror of
https://gitee.com/g1879/DrissionPage.git
synced 2024-12-10 04:00:23 +08:00
Merge branch 'develop' of https://gitee.com/g1879/DrissionPage into develop
Conflicts: DrissionPage/drission.py
This commit is contained in:
commit
b078af0da3
@ -732,7 +732,7 @@ def _cookie_to_dict(cookie: Union[Cookie, str, dict]) -> dict:
|
|||||||
cookie_dict = cookie
|
cookie_dict = cookie
|
||||||
|
|
||||||
elif isinstance(cookie, str):
|
elif isinstance(cookie, str):
|
||||||
cookie = cookie.split(';')
|
cookie = cookie.split(',' if ',' in cookie else ';')
|
||||||
cookie_dict = {}
|
cookie_dict = {}
|
||||||
|
|
||||||
for key, attr in enumerate(cookie):
|
for key, attr in enumerate(cookie):
|
||||||
|
@ -245,11 +245,13 @@ class Drission(object):
|
|||||||
:param url: 作用域
|
:param url: 作用域
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
if self.driver.current_url != url:
|
browser_domain = extract(self.driver.current_url).fqdn
|
||||||
|
ex_url = extract(url)
|
||||||
|
|
||||||
|
if ex_url.fqdn not in browser_domain:
|
||||||
self.driver.get(url)
|
self.driver.get(url)
|
||||||
|
|
||||||
url = extract(url)
|
domain = f'{ex_url.domain}.{ex_url.suffix}'
|
||||||
domain = f'{url.domain}.{url.suffix}'
|
|
||||||
|
|
||||||
cookies = []
|
cookies = []
|
||||||
for cookie in self.session.cookies:
|
for cookie in self.session.cookies:
|
||||||
|
@ -1416,7 +1416,9 @@ Set cookies.
|
|||||||
|
|
||||||
Parameter Description:
|
Parameter Description:
|
||||||
|
|
||||||
- cookies: Union[RequestsCookieJar, list, tuple, str, dict] - cookies information, can be CookieJar, list, tuple, str, dict
|
- cookies: Union[RequestsCookieJar, list, tuple, str, dict] - cookies information, can be CookieJar, list, tuple, str,
|
||||||
|
dict
|
||||||
|
- refresh: bool - Whether to refresh the page after setting cookies
|
||||||
|
|
||||||
Returns: None
|
Returns: None
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user