4.0.4.4修复handle_alert()和cli问题

DrissionPage/__init__.py

@@ -14,4 +14,4 @@ from ._configs.chromium_options import ChromiumOptions
 from ._configs.session_options import SessionOptions
 
 __all__ = ['ChromiumPage', 'ChromiumOptions', 'SessionOptions', 'SessionPage', 'WebPage', '__version__']
-__version__ = '4.0.4.3'
+__version__ = '4.0.4.4'

DrissionPage/_pages/chromium_base.py

@@ -878,7 +878,16 @@ class ChromiumBase(BasePage):
         self._driver = self.browser._get_driver(t_id, self)
 
     def handle_alert(self, accept=True, send=None, timeout=None, next_one=False):
+        """处理提示框，可以自动等待提示框出现
+        :param accept: True表示确认，False表示取消，为None不会按按钮但依然返回文本值
+        :param send: 处理prompt提示框时可输入文本
+        :param timeout: 等待提示框出现的超时时间（秒），为None则使用self.timeout属性的值
+        :param next_one: 是否处理下一个出现的提示框，为True时timeout参数无效
+        :return: 提示框内容文本，未等到提示框则返回False
+        """
         r = self._handle_alert(accept=accept, send=send, timeout=timeout, next_one=next_one)
+        if not isinstance(accept, bool):
+            return r
         while self._has_alert:
             sleep(.1)
         return r
@@ -905,6 +914,8 @@ class ChromiumBase(BasePage):
             return False
 
         res_text = self._alert.text
+        if not isinstance(accept, bool):
+            return res_text
         d = {'accept': accept, '_timeout': 0}
         if self._alert.type == 'prompt' and send is not None:
             d['promptText'] = send

DrissionPage/_pages/chromium_base.pyi

@@ -255,7 +255,7 @@ class ChromiumBase(BasePage):
 
     def reconnect(self, wait: float = 0) -> None: ...
 
-    def handle_alert(self, accept: bool = True, send: str = None, timeout: float = None,
+    def handle_alert(self, accept: Optional[bool] = True, send: str = None, timeout: float = None,
                      next_one: bool = False) -> Union[str, False]: ...
 
     def _handle_alert(self, accept: bool = True, send: str = None, timeout: float = None,

setup.py

@@ -38,7 +38,7 @@ setup(
     python_requires='>=3.6',
     entry_points={
         'console_scripts': [
-            'dp = DrissionPage.functions.cli:main',
+            'dp = DrissionPage._functions.cli:main',
         ],
     },
 )