微调注释

DrissionPage/_base/browser.py

@@ -178,34 +178,6 @@ class Chromium(object):
         return self._new_tab(MixTab, url=url, new_window=new_window,
                              background=background, new_context=new_context)
 
-    def _new_tab(self, obj, url=None, new_window=False, background=False, new_context=False):
-        tab = None
-        if new_context:
-            tab = self._run_cdp('Target.createBrowserContext')['browserContextId']
-
-        kwargs = {'url': ''}
-        if new_window:
-            kwargs['newWindow'] = True
-        if background:
-            kwargs['background'] = True
-        if tab:
-            kwargs['browserContextId'] = tab
-
-        if self.states.is_incognito():
-            return _new_tab_by_js(self, url, obj, new_window)
-        else:
-            try:
-                tab = self._run_cdp('Target.createTarget', **kwargs)['targetId']
-            except CDPError:
-                return _new_tab_by_js(self, url, obj, new_window)
-
-        while tab not in self._drivers:
-            sleep(.1)
-        tab = obj(self, tab)
-        if url:
-            tab.get(url)
-        return tab
-
     def get_tab(self, id_or_num=None, title=None, url=None, tab_type='page', as_id=False):
         t = self._get_tab(id_or_num=id_or_num, title=title, url=url, tab_type=tab_type, as_id=as_id)
         if t._type == 'MixTab':
@@ -224,50 +196,6 @@ class Chromium(object):
     def get_mix_tabs(self, title=None, url=None, tab_type='page', as_id=False):
         return self._get_tabs(title=title, url=url, tab_type=tab_type, mix=True, as_id=as_id)
 
-    def _get_tab(self, id_or_num=None, title=None, url=None, tab_type='page', mix=False, as_id=False):
-        if id_or_num is not None:
-            if isinstance(id_or_num, str):
-                id_or_num = id_or_num
-            elif isinstance(id_or_num, int):
-                id_or_num = self.tab_ids[id_or_num - 1 if id_or_num > 0 else id_or_num]
-            elif isinstance(id_or_num, ChromiumTab):
-                return id_or_num.tab_id if as_id else ChromiumTab(self, id_or_num.tab_id)
-
-        elif title == url is None and tab_type == 'page':
-            id_or_num = self.tab_ids[0]
-
-        else:
-            tabs = self._get_tabs(title=title, url=url, tab_type=tab_type, as_id=True)
-            if tabs:
-                id_or_num = tabs[0]
-            else:
-                return None
-
-        if as_id:
-            return id_or_num
-        with self._lock:
-            return MixTab(self, id_or_num) if mix else ChromiumTab(self, id_or_num)
-
-    def _get_tabs(self, title=None, url=None, tab_type='page', mix=False, as_id=False):
-        tabs = self._driver.get(f'http://{self.address}/json').json()  # 不要改用cdp
-
-        if isinstance(tab_type, str):
-            tab_type = {tab_type}
-        elif isinstance(tab_type, (list, tuple, set)):
-            tab_type = set(tab_type)
-        elif tab_type is not None:
-            raise TypeError('tab_type只能是set、list、tuple、str、None。')
-
-        tabs = [i for i in tabs if ((title is None or title in i['title']) and (url is None or url in i['url'])
-                                    and (tab_type is None or i['type'] in tab_type))]
-        if as_id:
-            return [tab['id'] for tab in tabs]
-        with self._lock:
-            if mix:
-                return [MixTab(self, tab['id']) for tab in tabs]
-            else:
-                return [ChromiumTab(self, tab['id']) for tab in tabs]
-
     def close_tabs(self, tabs_or_ids=None, others=False):
         all_tabs = set(self.tab_ids)
         if isinstance(tabs_or_ids, str):
@@ -370,6 +298,78 @@ class Chromium(object):
             path = Path(self._chromium_options.user_data_path)
             rmtree(path, True)
 
+    def _new_tab(self, obj, url=None, new_window=False, background=False, new_context=False):
+        tab = None
+        if new_context:
+            tab = self._run_cdp('Target.createBrowserContext')['browserContextId']
+
+        kwargs = {'url': ''}
+        if new_window:
+            kwargs['newWindow'] = True
+        if background:
+            kwargs['background'] = True
+        if tab:
+            kwargs['browserContextId'] = tab
+
+        if self.states.is_incognito():
+            return _new_tab_by_js(self, url, obj, new_window)
+        else:
+            try:
+                tab = self._run_cdp('Target.createTarget', **kwargs)['targetId']
+            except CDPError:
+                return _new_tab_by_js(self, url, obj, new_window)
+
+        while tab not in self._drivers:
+            sleep(.1)
+        tab = obj(self, tab)
+        if url:
+            tab.get(url)
+        return tab
+
+    def _get_tab(self, id_or_num=None, title=None, url=None, tab_type='page', mix=False, as_id=False):
+        if id_or_num is not None:
+            if isinstance(id_or_num, str):
+                id_or_num = id_or_num
+            elif isinstance(id_or_num, int):
+                id_or_num = self.tab_ids[id_or_num - 1 if id_or_num > 0 else id_or_num]
+            elif isinstance(id_or_num, ChromiumTab):
+                return id_or_num.tab_id if as_id else ChromiumTab(self, id_or_num.tab_id)
+
+        elif title == url is None and tab_type == 'page':
+            id_or_num = self.tab_ids[0]
+
+        else:
+            tabs = self._get_tabs(title=title, url=url, tab_type=tab_type, as_id=True)
+            if tabs:
+                id_or_num = tabs[0]
+            else:
+                return None
+
+        if as_id:
+            return id_or_num
+        with self._lock:
+            return MixTab(self, id_or_num) if mix else ChromiumTab(self, id_or_num)
+
+    def _get_tabs(self, title=None, url=None, tab_type='page', mix=False, as_id=False):
+        tabs = self._driver.get(f'http://{self.address}/json').json()  # 不要改用cdp
+
+        if isinstance(tab_type, str):
+            tab_type = {tab_type}
+        elif isinstance(tab_type, (list, tuple, set)):
+            tab_type = set(tab_type)
+        elif tab_type is not None:
+            raise TypeError('tab_type只能是set、list、tuple、str、None。')
+
+        tabs = [i for i in tabs if ((title is None or title in i['title']) and (url is None or url in i['url'])
+                                    and (tab_type is None or i['type'] in tab_type))]
+        if as_id:
+            return [tab['id'] for tab in tabs]
+        with self._lock:
+            if mix:
+                return [MixTab(self, tab['id']) for tab in tabs]
+            else:
+                return [ChromiumTab(self, tab['id']) for tab in tabs]
+
     def _run_cdp(self, cmd, **cmd_args):
         ignore = cmd_args.pop('_ignore', None)
         r = self._driver.run(cmd, **cmd_args)

DrissionPage/_base/browser.pyi

@@ -160,27 +160,11 @@ class Chromium(object):
         """
         ...
 
-    def _new_tab(self,
-                 obj,
-                 url: str = None,
-                 new_window: bool = False,
-                 background: bool = False,
-                 new_context: bool = False) -> Union[ChromiumTab, MixTab]:
-        """新建一个标签页
-        :param obj: 要创建的Tab类型
-        :param url: 新标签页跳转到的网址
-        :param new_window: 是否在新窗口打开标签页
-        :param background: 是否不激活新标签页，如new_window为True则无效
-        :param new_context: 是否创建新的上下文
-        :return: 新标签页对象
-        """
-        ...
-
     def get_tab(self,
                 id_or_num: Union[str, int] = None,
                 title: str = None,
                 url: str = None,
-                tab_type: str = 'page',
+                tab_type: Union[str, list, tuple] = 'page',
                 as_id: bool = False) -> Union[ChromiumTab, str]:
         """获取一个标签页对象，id_or_num不为None时，后面几个参数无效
         :param id_or_num: 要获取的标签页id或序号，序号从1开始，可传入负数获取倒数第几个，不是视觉排列顺序，而是激活顺序
@@ -195,7 +179,7 @@ class Chromium(object):
     def get_tabs(self,
                  title: str = None,
                  url: str = None,
-                 tab_type: str = 'page',
+                 tab_type: Union[str, list, tuple] = 'page',
                  as_id: bool = False) -> List[ChromiumTab, str]:
         """查找符合条件的tab，返回它们组成的列表，title和url是与关系
         :param title: 要匹配title的文本
@@ -210,7 +194,7 @@ class Chromium(object):
                     id_or_num: Union[str, int] = None,
                     title: str = None,
                     url: str = None,
-                    tab_type: str = 'page',
+                    tab_type: Union[str, list, tuple] = 'page',
                     as_id: bool = False) -> Union[MixTab, str]:
         """获取一个标签页对象，id_or_num不为None时，后面几个参数无效
         :param id_or_num: 要获取的标签页id或序号，序号从1开始，可传入负数获取倒数第几个，不是视觉排列顺序，而是激活顺序，为None时获取最后的
@@ -225,7 +209,7 @@ class Chromium(object):
     def get_mix_tabs(self,
                      title: str = None,
                      url: str = None,
-                     tab_type: str = 'page',
+                     tab_type: Union[str, list, tuple] = 'page',
                      as_id: bool = False) -> List[MixTab, str]:
         """查找符合条件的tab，返回它们组成的列表，title和url是与关系
         :param title: 要匹配title的文本
@@ -236,40 +220,6 @@ class Chromium(object):
         """
         ...
 
-    def _get_tab(self,
-                 id_or_num: Union[str, int] = None,
-                 title: str = None,
-                 url: str = None,
-                 tab_type: str = 'page',
-                 mix: bool = False,
-                 as_id: bool = False) -> Union[ChromiumTab, str]:
-        """获取一个标签页对象，id_or_num不为None时，后面几个参数无效
-        :param id_or_num: 要获取的标签页id或序号，序号从1开始，可传入负数获取倒数第几个，不是视觉排列顺序，而是激活顺序
-        :param title: 要匹配title的文本，模糊匹配，为None则匹配所有
-        :param url: 要匹配url的文本，模糊匹配，为None则匹配所有
-        :param tab_type: tab类型，可用列表输入多个，如 'page', 'iframe' 等，为None则匹配所有
-        :param mix: 是否返回可切换模式的Tab对象
-        :param as_id: 是否返回标签页id而不是标签页对象，mix=False时无效
-        :return: Tab对象
-        """
-        ...
-
-    def _get_tabs(self,
-                  title: str = None,
-                  url: str = None,
-                  tab_type: str = 'page',
-                  mix: bool = False,
-                  as_id: bool = False) -> List[ChromiumTab, str]:
-        """查找符合条件的tab，返回它们组成的列表，title和url是与关系
-        :param title: 要匹配title的文本
-        :param url: 要匹配url的文本
-        :param tab_type: tab类型，可用列表输入多个
-        :param mix: 是否返回可切换模式的Tab对象
-        :param as_id: 是否返回标签页id而不是标签页对象，mix=False时无效
-        :return: Tab对象列表
-        """
-        ...
-
     def close_tabs(self,
                    tabs_or_ids: Union[str, ChromiumTab, List[Union[str, ChromiumTab]],
                    Tuple[Union[str, ChromiumTab]]] = None,
@@ -309,6 +259,56 @@ class Chromium(object):
         """
         ...
 
+    def _new_tab(self,
+                 obj,
+                 url: str = None,
+                 new_window: bool = False,
+                 background: bool = False,
+                 new_context: bool = False) -> Union[ChromiumTab, MixTab]:
+        """新建一个标签页
+        :param obj: 要创建的Tab类型
+        :param url: 新标签页跳转到的网址
+        :param new_window: 是否在新窗口打开标签页
+        :param background: 是否不激活新标签页，如new_window为True则无效
+        :param new_context: 是否创建新的上下文
+        :return: 新标签页对象
+        """
+        ...
+
+    def _get_tab(self,
+                 id_or_num: Union[str, int] = None,
+                 title: str = None,
+                 url: str = None,
+                 tab_type: Union[str, list, tuple] = 'page',
+                 mix: bool = False,
+                 as_id: bool = False) -> Union[ChromiumTab, str]:
+        """获取一个标签页对象，id_or_num不为None时，后面几个参数无效
+        :param id_or_num: 要获取的标签页id或序号，序号从1开始，可传入负数获取倒数第几个，不是视觉排列顺序，而是激活顺序
+        :param title: 要匹配title的文本，模糊匹配，为None则匹配所有
+        :param url: 要匹配url的文本，模糊匹配，为None则匹配所有
+        :param tab_type: tab类型，可用列表输入多个，如 'page', 'iframe' 等，为None则匹配所有
+        :param mix: 是否返回可切换模式的Tab对象
+        :param as_id: 是否返回标签页id而不是标签页对象，mix=False时无效
+        :return: Tab对象
+        """
+        ...
+
+    def _get_tabs(self,
+                  title: str = None,
+                  url: str = None,
+                  tab_type: Union[str, list, tuple] = 'page',
+                  mix: bool = False,
+                  as_id: bool = False) -> List[ChromiumTab, str]:
+        """查找符合条件的tab，返回它们组成的列表，title和url是与关系
+        :param title: 要匹配title的文本
+        :param url: 要匹配url的文本
+        :param tab_type: tab类型，可用列表输入多个
+        :param mix: 是否返回可切换模式的Tab对象
+        :param as_id: 是否返回标签页id而不是标签页对象，mix=False时无效
+        :return: Tab对象列表
+        """
+        ...
+
     def _run_cdp(self, cmd, **cmd_args) -> dict:
         """执行Chrome DevTools Protocol语句
         :param cmd: 协议项目