refactoring maps code on set comprehension (python-caldav#417)

autinerd · Jun 13, 2024 · 3031145 · 3031145
1 parent 1a700ca
commit 3031145
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/caldav/davclient.py b/caldav/davclient.py
@@ -616,11 +616,9 @@ def delete(self, url: str) -> DAVResponse:
     def options(self, url: str) -> DAVResponse:
         return self.request(url, "OPTIONS")
 
-    def extract_auth_types(self, header):
-        auth_types = header.lower().split(",")
-        auth_types = map(lambda auth_type: auth_type.strip(), auth_types)
-        auth_types = map(lambda auth_type: auth_type.split(" ")[0], auth_types)
-        return list(filter(lambda auth_type: auth_type, auth_types))
+    def extract_auth_types(self, header: str):
+        # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/WWW-Authenticate#syntax
+        return {h.split()[0] for h in header.lower().split(",")}
 
     def request(
         self,

diff --git a/tests/test_caldav_unit.py b/tests/test_caldav_unit.py
@@ -1293,12 +1293,12 @@ def testExtractAuth(self):
         """
         cal_url = "http://me:[email protected]:80/"
         with DAVClient(url=cal_url) as client:
-            assert client.extract_auth_types("Basic\n") == ["basic"]
-            assert client.extract_auth_types("Basic") == ["basic"]
-            assert client.extract_auth_types('Basic Realm=foo;charset="UTF-8"') == [
+            assert client.extract_auth_types("Basic\n") == {"basic"}
+            assert client.extract_auth_types("Basic") == {"basic"}
+            assert client.extract_auth_types('Basic Realm=foo;charset="UTF-8"') == {
                 "basic"
-            ]
-            assert client.extract_auth_types("Basic,dIGEST Realm=foo") == [
+            }
+            assert client.extract_auth_types("Basic,dIGEST Realm=foo") == {
                 "basic",
                 "digest",
-            ]
+            }