From 731d40a8915733e71517c37cc7a7a7b9f2a9d7cb Mon Sep 17 00:00:00 2001 From: g1879 Date: Wed, 13 Dec 2023 15:34:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0CookieFormatError=EF=BC=9B?= =?UTF-8?q?=E5=8A=A8=E4=BD=9C=E9=93=BEtype()text=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B9=E4=B8=BAkeys=EF=BC=8Cinput()=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B9=E4=B8=BAtext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DrissionPage/_functions/tools.py | 4 +++- DrissionPage/_units/actions.py | 14 +++++++------- DrissionPage/_units/actions.pyi | 4 ++-- DrissionPage/errors.py | 4 ++++ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/DrissionPage/_functions/tools.py b/DrissionPage/_functions/tools.py index 77a9d56..c36af3d 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, PageClosedError, NoRectError, AlertExistsError, - WrongURLError, StorageError) + WrongURLError, StorageError, CookieFormatError) def get_usable_path(path, is_file=True, parents=True): @@ -278,6 +278,8 @@ def raise_error(r): raise WrongURLError(f'无效的url：{r["args"]["url"]}。也许要加上"http://"？') elif error == 'Frame corresponds to an opaque origin and its storage key cannot be serialized': raise StorageError + elif error == 'Sanitizing cookie failed': + raise CookieFormatError(f'cookie格式不正确：{r["args"]}') elif r['type'] == 'call_method_error': raise CDPError(f'\n错误：{r["error"]}\nmethod：{r["method"]}\nargs：{r["args"]}\n出现这个错误可能意味着程序有bug，' '请把错误信息和重现方法告知作者，谢谢。\n报告网站：https://gitee.com/g1879/DrissionPage/issues') diff --git a/DrissionPage/_units/actions.py b/DrissionPage/_units/actions.py index 33dc4c9..e933913 100644 --- a/DrissionPage/_units/actions.py +++ b/DrissionPage/_units/actions.py @@ -268,24 +268,24 @@ class Actions: self.page.run_cdp('Input.dispatchKeyEvent', **data) return self - def type(self, text): - """用模拟键盘按键方式输入文本，可输入字符串，只能输入键盘上有的字符 - :param text: 要输入的文本，特殊字符和多个文本可用list或tuple传入 + def type(self, keys): + """用模拟键盘按键方式输入文本，可输入字符串，也可输入组合键，只能输入键盘上有的字符 + :param keys: 要按下的按键，特殊字符和多个文本可用list或tuple传入 :return: self """ - for i in text: + for i in keys: for character in i: self.key_down(character) sleep(.05) self.key_up(character) return self - def input(self, text_or_keys): + def input(self, text): """输入文本，也可输入组合键，组合键用tuple形式输入 - :param text_or_keys: 文本值或按键组合 + :param text: 文本值或按键组合 :return: self """ - input_text_or_keys(self.page, text_or_keys) + input_text_or_keys(self.page, text) return self def wait(self, second): diff --git a/DrissionPage/_units/actions.pyi b/DrissionPage/_units/actions.pyi index 94663e0..3b6045c 100644 --- a/DrissionPage/_units/actions.pyi +++ b/DrissionPage/_units/actions.pyi @@ -93,9 +93,9 @@ class Actions: def key_up(self, key: KEYS) -> Actions: ... - def type(self, text: Union[str, list, tuple]) -> Actions: ... + def type(self, keys: Union[str, list, tuple]) -> Actions: ... - def input(self, text_or_keys: Any) -> Actions: ... + def input(self, text: Any) -> Actions: ... def wait(self, second: float) -> Actions: ... diff --git a/DrissionPage/errors.py b/DrissionPage/errors.py index 14e4907..5e8677a 100644 --- a/DrissionPage/errors.py +++ b/DrissionPage/errors.py @@ -83,3 +83,7 @@ class WrongURLError(BaseError): class StorageError(BaseError): _info = '无法操作当前存储数据。' + + +class CookieFormatError(BaseError): + _info = 'cookie格式不正确。'