From 5c8ba2da5829157f32fa0f01b93c0ab0fe81d2b4 Mon Sep 17 00:00:00 2001 From: g1879 Date: Wed, 3 Jan 2024 11:06:39 +0800 Subject: [PATCH] =?UTF-8?q?4.0.0b34=E4=BF=AE=E5=A4=8Dget()timeout=E5=BE=88?= =?UTF-8?q?=E7=9F=AD=E6=97=B6=E6=8A=A5=E9=94=99=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 | 11 +++++++---- setup.py | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/DrissionPage/__init__.py b/DrissionPage/__init__.py index 859c24c..7ab5984 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.0b33' +__version__ = '4.0.0b34' diff --git a/DrissionPage/_functions/tools.py b/DrissionPage/_functions/tools.py index 81e9515..dcdae15 100644 --- a/DrissionPage/_functions/tools.py +++ b/DrissionPage/_functions/tools.py @@ -13,7 +13,7 @@ from psutil import process_iter, AccessDenied, NoSuchProcess, ZombieProcess from .._configs.options_manage import OptionsManager from ..errors import (ContextLostError, ElementLostError, CDPError, PageDisconnectedError, NoRectError, - AlertExistsError, WrongURLError, StorageError, CookieFormatError) + AlertExistsError, WrongURLError, StorageError, CookieFormatError, JavaScriptError) def get_usable_path(path, is_file=True, parents=True): @@ -279,12 +279,15 @@ def raise_error(result, ignore=None): r = StorageError() elif error == 'Sanitizing cookie failed': r = CookieFormatError(f'cookie格式不正确：{result["args"]}') + elif error == 'Given expression does not evaluate to a function': + r = JavaScriptError(f'传入的js无法解析成函数：\n{result["args"]["functionDeclaration"]}') elif result['type'] in ('call_method_error', 'timeout'): from DrissionPage import __version__ from time import process_time - r = CDPError(f'\n错误：{result["error"]}\nmethod：{result["method"]}\nargs：{result["args"]}\n' - f'版本：{__version__}\n运行时间：{process_time()}\n出现这个错误可能意味着程序有bug，请把错误信息和重现方法' - '告知作者，谢谢。\n报告网站：https://gitee.com/g1879/DrissionPage/issues') + txt = f'\n错误：{result["error"]}\nmethod：{result["method"]}\nargs：{result["args"]}\n' \ + f'版本：{__version__}\n运行时间：{process_time()}\n出现这个错误可能意味着程序有bug，请把错误信息和重现方法' \ + '告知作者，谢谢。\n报告网站：https://gitee.com/g1879/DrissionPage/issues' + r = TimeoutError(txt) if result['type'] == 'timeout' else CDPError(txt) else: r = RuntimeError(result) diff --git a/setup.py b/setup.py index 424413e..e304e1f 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.0b33", + version="4.0.0b34", author="g1879", author_email="g1879@qq.com", description="Python based web automation tool. It can control the browser and send and receive data packets.",