From 6ccc21b1f6743188b4f6887386a410d69e2581f8 Mon Sep 17 00:00:00 2001 From: g1879 Date: Fri, 14 Jan 2022 19:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DrissionPage/mix_page.py | 14 ++++++-------- setup.py | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/DrissionPage/mix_page.py b/DrissionPage/mix_page.py index c24a3da..6512726 100644 --- a/DrissionPage/mix_page.py +++ b/DrissionPage/mix_page.py @@ -53,15 +53,13 @@ class MixPage(SessionPage, DriverPage, BasePage): self._response = None if self._mode == 'd': - self._drission.driver # 接管或创建浏览器 + try: + timeouts = self.drission.driver_options.timeouts + t = timeout if timeout is not None else timeouts['implicit'] / 1000 + self.set_timeouts(t, timeouts['pageLoad'] / 1000, timeouts['script'] / 1000) - try: - timeouts = self.drission.driver_options.timeouts - t = timeout if timeout is not None else timeouts['implicit'] / 1000 - self.set_timeouts(t, timeouts['pageLoad'] / 1000, timeouts['script'] / 1000) - - except Exception: - self.timeout = timeout if timeout is not None else 10 + except Exception: + self.timeout = timeout if timeout is not None else 10 def __call__(self, loc_or_str: Union[Tuple[str, str], str, DriverElement, SessionElement, WebElement], diff --git a/setup.py b/setup.py index 9468334..b1d9589 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8') as fh: setup( name="DrissionPage", - version="2.3.2", + version="2.3.3", author="g1879", author_email="g1879@qq.com", description="A module that integrates selenium and requests session, encapsulates common page operations.",