clear-skies 2.0.11__py3-none-any.whl → 2.0.12__py3-none-any.whl

{clear_skies-2.0.11.dist-info → clear_skies-2.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clear-skies
-Version: 2.0.11
+Version: 2.0.12
 Summary: A framework for building backends in the cloud
 Project-URL: Documentation, https://clearskies.io/
 Project-URL: Repository, https://github.com/clearskies-py/clearskies

{clear_skies-2.0.11.dist-info → clear_skies-2.0.12.dist-info}/RECORD

@@ -207,7 +207,7 @@ clearskies/functional/string.py,sha256=ZnkOjx8nxqZq2TV0CIb-Kz4onGoyekTX_WkLJM6XT
 clearskies/functional/validations.py,sha256=cPYOTwWomlQrPvqPP_Jdlds7zZ5H9GABCP5pnGzC9T4,2821
 clearskies/input_outputs/__init__.py,sha256=9qeKJULw3MQ3zqkgBZice5d7qqRgsP3y-wkhWO2Y9vM,362
 clearskies/input_outputs/cli.py,sha256=t7uWqLi6VI3i_zuyoKLdIq3vUwr19lQZoJmuAxVEvgg,5741
-clearskies/input_outputs/headers.py,sha256=qdnPEUJ2amKUdzasbTQb015KGzJP-d4RjIbtrPdqTqM,1680
+clearskies/input_outputs/headers.py,sha256=AnyqI64kploPX7qiBfQCD9w8b2FYWVIuwaXVafbpIiM,2085
 clearskies/input_outputs/input_output.py,sha256=tJQVN3U3MX_jpwsXJ-g-K1cdqQwyuSarTjo3JOp7zQQ,5154
 clearskies/input_outputs/programmatic.py,sha256=OCRq0M42cKZKgk4YAfJyTWo3T4jNRmnGmVr7zCTovpg,1658
 clearskies/input_outputs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -251,7 +251,7 @@ clearskies/validators/minimum_value.py,sha256=NDLcG6xCemlv3kfr-RiUaM3x2INS1GJGMB
 clearskies/validators/required.py,sha256=GWxyexwj-K6DunZWNEnZxW6tQGAFd4oOCvQrW1s1K9k,1308
 clearskies/validators/timedelta.py,sha256=DJ0pTm-SSUtjZ7phGoD6vjb086vXPzvLLijkU-jQlOs,1892
 clearskies/validators/unique.py,sha256=GFEQOMYRIO9pSGHHj6zf1GdnJ0UM7Dm4ZO4uGn19BZo,991
-clear_skies-2.0.11.dist-info/METADATA,sha256=KsFDLUKDhP1zHg3H2qmyDILiNZ4Ko0LfYTVyXUNywVM,2114
-clear_skies-2.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-clear_skies-2.0.11.dist-info/licenses/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-2.0.11.dist-info/RECORD,,
+clear_skies-2.0.12.dist-info/METADATA,sha256=Lq1xv-aCUbaeDxJUtsjY36pQDKoGhV7JMQ7i0nhjKsM,2114
+clear_skies-2.0.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+clear_skies-2.0.12.dist-info/licenses/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-2.0.12.dist-info/RECORD,,

clearskies/input_outputs/headers.py

@@ -1,47 +1,53 @@
 from __future__ import annotations
 
 import re
+from typing import TypeVar
 
+_T = TypeVar("_T")
 
-class Headers:
-    _headers: dict[str, str] = {}
+
+class Headers(dict[str, str]):
     _duck_cheat = "headers"
 
-    def __init__(self, headers: dict[str, str] = {}):
-        self.__dict__["_headers"] = (
+    def __init__(self, headers: dict[str, str] = {}) -> None:
+        normalized_headers = (
             {key.upper().replace("_", "-"): value for (key, value) in headers.items()} if headers else {}
         )
+        super().__init__(normalized_headers)
 
-    def __contains__(self, key: str):
-        return key.upper().replace("_", "-") in self._headers
+    def __contains__(self, key: object) -> bool:
+        if not isinstance(key, str):
+            return False
+        return super().__contains__(key.upper().replace("_", "-"))
 
-    def __getattr__(self, key: str) -> str | None:
-        return self._headers.get(key.upper().replace("_", "-"), None)
+    def __getitem__(self, key: str) -> str:
+        return super().__getitem__(key.upper().replace("_", "-"))
 
-    def __setattr__(self, key: str, value: str) -> None:
+    def __setitem__(self, key: str, value: str) -> None:
         if not isinstance(key, str):
             raise TypeError(
-                f"Header keys must be strings, but an object of type '{value.__class__.__name__}' was provided."
+                f"Header keys must be strings, but an object of type '{key.__class__.__name__}' was provided."
             )
         if not isinstance(value, str):
             raise TypeError(
                 f"Header values must be strings, but an object of type '{value.__class__.__name__}' was provided."
             )
-        self._headers[re.sub("\\s+", " ", key.upper().replace("_", "-"))] = re.sub("\\s+", " ", value.strip())
+        normalized_key = re.sub("\\s+", " ", key.upper().replace("_", "-"))
+        normalized_value = re.sub("\\s+", " ", value.strip())
+        super().__setitem__(normalized_key, normalized_value)
 
-    def get(self, key, default=None):
-        if key not in self:
-            return default
-        return self.__getattr__(key)
-
-    def keys(self) -> list[str]:
-        return list(self._headers.keys())
-
-    def values(self) -> list[str]:
-        return list(self._headers.keys())
+    def __getattr__(self, key: str) -> str | None:
+        return self.get(key.upper().replace("_", "-"), None)
 
-    def items(self) -> list[tuple[str]]:
-        return list(self._headers.items())  # type: ignore
+    def __setattr__(self, key: str, value: str) -> None:
+        if key.startswith("_") or key == "_duck_cheat":
+            # Allow setting private attributes and special attributes normally
+            super().__setattr__(key, value)
+        else:
+            self.__setitem__(key, value)
+
+    def get(self, key: str, default: _T = None) -> str | _T:  # type: ignore[assignment]
+        return super().get(key.upper().replace("_", "-"), default)
 
     def add(self, key: str, value: str) -> None:
         """Add a header.  This expects a string with a colon separating the key and value."""