From 40dd6290d164507b4fd1abd51af975489f489bb8 Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Fri, 7 Jun 2024 17:36:07 +0800
Subject: [PATCH] =?UTF-8?q?eles=E7=AD=9B=E9=80=89=E5=A2=9E=E5=8A=A0attr()?=
 =?UTF-8?q?=EF=BC=9Bset.cookies()=E5=8F=AA=E6=94=AF=E6=8C=81;=E5=88=86?=
 =?UTF-8?q?=E9=9A=94cookies=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/_functions/tools.py  | 12 ++++++++++++
 DrissionPage/_functions/tools.pyi |  2 ++
 DrissionPage/_functions/web.py    | 14 ++++++++------
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/DrissionPage/_functions/tools.py b/DrissionPage/_functions/tools.py
index 46c557d..5a1df3f 100644
--- a/DrissionPage/_functions/tools.py
+++ b/DrissionPage/_functions/tools.py
@@ -307,6 +307,18 @@ class ElementsList(list):
                 r.append(i)
         return r
 
+    def attr(self, name, value):
+        """返回所有拥有某个attribute值的元素
+        :param name: 属性名称
+        :param value: 属性值
+        :return: 筛选结果
+        """
+        r = ElementsList()
+        for i in self:
+            if i.attr(name) == value:
+                r.append(i)
+        return r
+
     def _any_state(self, name, is_not=False):
         """
         :param name: 状态名称
diff --git a/DrissionPage/_functions/tools.pyi b/DrissionPage/_functions/tools.pyi
index 499639f..c35ee0f 100644
--- a/DrissionPage/_functions/tools.pyi
+++ b/DrissionPage/_functions/tools.pyi
@@ -78,4 +78,6 @@ class ElementsList(list):
 
     def property(self, name: str, value: str) -> List[ChromiumElement]: ...
 
+    def attr(self, name: str, value: str) -> List[ChromiumElement]: ...
+
     def _any_state(self, name: str, is_not: bool = False) -> List[ChromiumElement]: ...
diff --git a/DrissionPage/_functions/web.py b/DrissionPage/_functions/web.py
index 132d418..461f143 100644
--- a/DrissionPage/_functions/web.py
+++ b/DrissionPage/_functions/web.py
@@ -213,12 +213,14 @@ def cookies_to_tuple(cookies):
 
     elif isinstance(cookies, str):
         c_dict = {}
-        r = match(r'.*?=([^=]+)=', cookies)
-        if not r:  # 只有一个
-            cookies = [cookies.rstrip(',;')]
-        else:
-            s = match(r'.*([,;]).*', r.group(1)).group(1)
-            cookies = cookies.rstrip(s).split(s)
+        cookies = cookies.rstrip('; ')
+        cookies = cookies.split(';')
+        # r = match(r'.*?=([^=]+)=', cookies)
+        # if not r:  # 只有一个
+        #     cookies = [cookies.rstrip(',;')]
+        # else:
+        #     s = match(r'.*([,;]).*', r.group(1)).group(1)
+        #     cookies = cookies.rstrip(s).split(s)
 
         for attr in cookies:
             attr_val = attr.strip().split('=', 1)