Merge branch 'develop' of https://gitee.com/g1879/DrissionPage into develop

 Conflicts:
	DrissionPage/drission.py
This commit is contained in:
g1879 2020-12-09 15:43:59 +08:00
commit b078af0da3
3 changed files with 9 additions and 5 deletions

View File

@ -732,7 +732,7 @@ def _cookie_to_dict(cookie: Union[Cookie, str, dict]) -> dict:
cookie_dict = cookie
elif isinstance(cookie, str):
cookie = cookie.split(';')
cookie = cookie.split(',' if ',' in cookie else ';')
cookie_dict = {}
for key, attr in enumerate(cookie):

View File

@ -245,11 +245,13 @@ class Drission(object):
:param url: 作用域
: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)
url = extract(url)
domain = f'{url.domain}.{url.suffix}'
domain = f'{ex_url.domain}.{ex_url.suffix}'
cookies = []
for cookie in self.session.cookies:

View File

@ -1416,7 +1416,9 @@ Set cookies.
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