From 9555afa396f8c6b7dd6a879dcea491ede14482bf Mon Sep 17 00:00:00 2001 From: g1879 Date: Thu, 2 Mar 2023 16:55:16 +0800 Subject: [PATCH] 3.2.6 --- DrissionPage/chromium_base.py | 4 ++-- DrissionPage/chromium_page.py | 4 ++-- DrissionPage/commons/browser.py | 3 ++- DrissionPage/errors.py | 4 ++++ setup.py | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/DrissionPage/chromium_base.py b/DrissionPage/chromium_base.py index 8e82e94..97cbda0 100644 --- a/DrissionPage/chromium_base.py +++ b/DrissionPage/chromium_base.py @@ -18,7 +18,7 @@ from .commons.locator import get_loc from .commons.tools import get_usable_path from .commons.web import cookies_to_tuple from .errors import ContextLossError, ElementLossError, AlertExistsError, CallMethodError, TabClosedError, \ - NoRectError + NoRectError, BrowserConnectError from .session_element import make_session_ele @@ -66,7 +66,7 @@ class ChromiumBase(BasePage): json = self._control_session.get(f'http://{self.address}/json').json() tab_id = [i['id'] for i in json if i['type'] == 'page'] if not tab_id: - raise ConnectionError('连接浏览器失败。') + raise BrowserConnectError('浏览器连接失败。') tab_id = tab_id[0] self._driver_init(tab_id) self._get_document() diff --git a/DrissionPage/chromium_page.py b/DrissionPage/chromium_page.py index e447e1e..e062030 100644 --- a/DrissionPage/chromium_page.py +++ b/DrissionPage/chromium_page.py @@ -17,7 +17,7 @@ from .chromium_tab import ChromiumTab from .commons.browser import connect_browser from .commons.web import set_session_cookies from .configs.chromium_options import ChromiumOptions -from .errors import CallMethodError +from .errors import CallMethodError, BrowserConnectError from .session_page import DownloadSetter @@ -81,7 +81,7 @@ class ChromiumPage(ChromiumBase): json = self._control_session.get(f'http://{self.address}/json').json() tab_id = [i['id'] for i in json if i['type'] == 'page'] if not tab_id: - raise ConnectionError('连接浏览器失败。') + raise BrowserConnectError('浏览器连接失败。') tab_id = tab_id[0] self._driver_init(tab_id) diff --git a/DrissionPage/commons/browser.py b/DrissionPage/commons/browser.py index 39fbc41..8f0e838 100644 --- a/DrissionPage/commons/browser.py +++ b/DrissionPage/commons/browser.py @@ -13,6 +13,7 @@ from time import perf_counter, sleep from requests import get as requests_get from DrissionPage.configs.chromium_options import ChromiumOptions +from DrissionPage.errors import BrowserConnectError from .tools import port_is_using, get_exe_from_port @@ -157,7 +158,7 @@ def _run_browser(port, path: str, args) -> Popen: except Exception: sleep(.2) - raise ConnectionError('连接浏览器失败。') + raise BrowserConnectError def _make_leave_in_dict(target_dict: dict, src: list, num: int, end: int) -> None: diff --git a/DrissionPage/errors.py b/DrissionPage/errors.py index 840dd3f..d72c325 100644 --- a/DrissionPage/errors.py +++ b/DrissionPage/errors.py @@ -42,3 +42,7 @@ class JavaScriptError(BaseError): class NoRectError(BaseError): _info = '该元素没有位置及大小。' + + +class BrowserConnectError(BaseError): + _info = '浏览器连接失败。' diff --git a/setup.py b/setup.py index 129b987..f60a086 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="3.2.5", + version="3.2.6", author="g1879", author_email="g1879@qq.com", description="Python based web automation tool. It can control the browser and send and receive data packets.",