From b1f4c0767d177117255269382a5f8d03868a0a38 Mon Sep 17 00:00:00 2001 From: g1879 Date: Tue, 19 Dec 2023 21:29:04 +0800 Subject: [PATCH] =?UTF-8?q?4.0.0b24=E4=BF=AE=E5=A4=8D=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?=E9=93=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DrissionPage/__init__.py | 2 +- DrissionPage/_functions/tools.py | 7 ++++--- DrissionPage/_units/actions.py | 8 ++++---- setup.py | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/DrissionPage/__init__.py b/DrissionPage/__init__.py index 4ffc37d..e51d275 100644 --- a/DrissionPage/__init__.py +++ b/DrissionPage/__init__.py @@ -13,4 +13,4 @@ from ._configs.chromium_options import ChromiumOptions from ._configs.session_options import SessionOptions __all__ = ['ChromiumPage', 'ChromiumOptions', 'SessionOptions', 'SessionPage', 'WebPage', '__version__'] -__version__ = '4.0.0b23' +__version__ = '4.0.0b24' diff --git a/DrissionPage/_functions/tools.py b/DrissionPage/_functions/tools.py index f0cc963..5665a69 100644 --- a/DrissionPage/_functions/tools.py +++ b/DrissionPage/_functions/tools.py @@ -211,7 +211,7 @@ def wait_until(page, condition, timeout=10, poll=0.1, raise_err=True): value = condition_method(page) if value: return value - except Exception as exc: + except Exception: pass sleep(poll) @@ -284,8 +284,9 @@ def raise_error(result, ignore=None): elif error == 'Sanitizing cookie failed': r = CookieFormatError(f'cookie格式不正确：{result["args"]}') elif result['type'] == 'call_method_error': - r = CDPError(f'\n错误：{result["error"]}\nmethod：{result["method"]}\nargs：{result["args"]}\n出现这个错误可能意味着程序有bug，' - '请把错误信息和重现方法告知作者，谢谢。\n报告网站：https://gitee.com/g1879/DrissionPage/issues') + r = CDPError(f'\n错误：{result["error"]}\nmethod：{result["method"]}\nargs：{result["args"]}\n' + f'出现这个错误可能意味着程序有bug，请把错误信息和重现方法告知作者，谢谢。' + f'\n报告网站：https://gitee.com/g1879/DrissionPage/issues') else: r = RuntimeError(result) diff --git a/DrissionPage/_units/actions.py b/DrissionPage/_units/actions.py index f9da1bd..c6a47ac 100644 --- a/DrissionPage/_units/actions.py +++ b/DrissionPage/_units/actions.py @@ -85,7 +85,7 @@ class Actions: self.curr_x = x self.curr_y = y self._dr.run('Input.dispatchMouseEvent', type='mouseMoved', x=self.curr_x, y=self.curr_y, - modifiers=self.modifier, _ignore=AlertExistsError, _timeout=1) + modifiers=self.modifier, _timeout=1) ss = .02 - perf_counter() + t if ss > 0: sleep(ss) @@ -188,7 +188,7 @@ class Actions: if on_ele: self.move_to(on_ele, duration=0) self._dr.run('Input.dispatchMouseEvent', type='mousePressed', button=button, clickCount=count, - x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _ignore=AlertExistsError, _timeout=1) + x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _timeout=1) return self def _release(self, button): @@ -197,7 +197,7 @@ class Actions: :return: self """ self._dr.run('Input.dispatchMouseEvent', type='mouseReleased', button=button, clickCount=1, - x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _ignore=AlertExistsError, _timeout=1) + x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _timeout=1) return self def scroll(self, delta_x=0, delta_y=0, on_ele=None): @@ -210,7 +210,7 @@ class Actions: if on_ele: self.move_to(on_ele, duration=0) self._dr.run('Input.dispatchMouseEvent', type='mouseWheel', x=self.curr_x, y=self.curr_y, - deltaX=delta_x, deltaY=delta_y, modifiers=self.modifier, _ignore=AlertExistsError, _timeout=1) + deltaX=delta_x, deltaY=delta_y, modifiers=self.modifier, _timeout=1) return self def up(self, pixel): diff --git a/setup.py b/setup.py index 5a0d122..99298bd 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="4.0.0b23", + version="4.0.0b24", author="g1879", author_email="g1879@qq.com", description="Python based web automation tool. It can control the browser and send and receive data packets.",