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

修复切换模式时url出错的bug

Browse Source
This commit is contained in:
g1879 2020-08-05 17:33:05 +08:00
parent e4c5a6ad0c
commit bda0f9972a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DrissionPage/mix_page.py
View File

@ -56,10 +56,13 @@ class MixPage(Null, SessionPage, DriverPage):
raise ValueError("Argument mode can only be 'd' or 's'.") raise ValueError("Argument mode can only be 'd' or 's'.")
@property @property
def url(self) -> str: def url(self) -> Union[str, None]:
"""根据模式获取当前活动的url""" """根据模式获取当前活动的url"""
if self._mode == 'd': if self._mode == 'd':
return super(SessionPage, self).url if not self._driver or not self._drission.driver.current_url.startswith('http'):
return None
else:
return self._drission.driver.current_url
elif self._mode == 's': elif self._mode == 's':
return self.session_url return self.session_url
@ -85,19 +88,19 @@ class MixPage(Null, SessionPage, DriverPage):
return return
self._mode = 's' if self._mode == 'd' else 'd' self._mode = 's' if self._mode == 'd' else 'd'
if self._mode == 'd': # s转d if self._mode == 'd': # s转d
self._url = super(SessionPage, self).url self._driver = True
self._url = None if not self._driver else self._drission.driver.current_url
if self.session_url: if self.session_url:
self.cookies_to_driver(self.session_url) self.cookies_to_driver(self.session_url)
if go: if go:
self.get(self.session_url) self.get(self.session_url)
elif self._mode == 's': # d转s elif self._mode == 's': # d转s
self._url = self.session_url
if self._session is None:
self._session = True self._session = True
self._url = self.session_url
if self._driver: if self._driver:
self.cookies_to_session() self.cookies_to_session()
if go: if go and self._drission.driver.current_url.startswith('http'):
self.get(super(SessionPage, self).url) self.get(self._drission.driver.current_url)
@property @property
def drission(self) -> Drission: def drission(self) -> Drission:
@ -197,7 +200,6 @@ class MixPage(Null, SessionPage, DriverPage):
return super().ele(loc_or_ele, mode=mode, show_errmsg=show_errmsg) return super().ele(loc_or_ele, mode=mode, show_errmsg=show_errmsg)
elif self._mode == 'd': elif self._mode == 'd':
timeout = timeout or self.timeout timeout = timeout or self.timeout
# return super(SessionPage, self).ele(loc_or_ele, mode=mode, timeout=timeout, show_errmsg=show_errmsg)
return DriverPage.ele(self, loc_or_ele, mode=mode, timeout=timeout, show_errmsg=show_errmsg) return DriverPage.ele(self, loc_or_ele, mode=mode, timeout=timeout, show_errmsg=show_errmsg)
def eles(self, loc_or_str: Union[tuple, str], timeout: float = None, show_errmsg: bool = False) \ def eles(self, loc_or_str: Union[tuple, str], timeout: float = None, show_errmsg: bool = False) \