pysigned 0.2.2__tar.gz → 0.2.4__tar.gz

{pysigned-0.2.2 → pysigned-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysigned
-Version: 0.2.2
+Version: 0.2.4
 Summary: Sign and verify URLs with an expiry, using HMAC or Ed25519
 Author: Meg Hicks
 Author-email: Meg Hicks <meg.d.hicks@gmail.com>

{pysigned-0.2.2 → pysigned-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pysigned"
-version = "0.2.2"
+version = "0.2.4"
 description = "Sign and verify URLs with an expiry, using HMAC or Ed25519"
 readme = "README.md"
 authors = [

{pysigned-0.2.2 → pysigned-0.2.4}/src/pysigned/backends.py

@@ -37,7 +37,7 @@ class Backend:
     def __init__(self, digest: str = DIGEST):
         self.digest = digest
 
-    def parse_key(self, value: KeyValue) -> KeyLike:
+    def parse_key(self, value: KeyValue) -> Key | Ed25519KeyPair:
         """Wrap a user-supplied key value as a :class:`~pysigned.keys.KeyLike`.
 
         Already-wrapped keys pass through; raw ``bytes`` or a ``(bytes, id)``

{pysigned-0.2.2 → pysigned-0.2.4}/src/pysigned/keys.py

@@ -5,11 +5,11 @@ from base64 import urlsafe_b64decode
 from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any, Self, cast
+from typing import TYPE_CHECKING, Any, Self, cast, Iterator
 from cryptography.hazmat.primitives.asymmetric import ed25519
 
 if TYPE_CHECKING:
-    from .backends import Backend
+    from .backends import Backend, KeyValue
 
 DIGEST = "sha512"
 # HMAC keys must be at least the digest's output size (NIST SP 800-107).
@@ -146,6 +146,10 @@ class Ed25519KeyPair(KeyLike):
         """The verify-only public key for this pair, sharing its id."""
         return Ed25519PublicKey(self.public_key.public_bytes_raw(), self.id)
 
+    def __bytes__(self) -> bytes:
+        """The raw public-key bytes (its public identity); never the seed."""
+        return self.public_key.public_bytes_raw()
+
     def _id_bytes(self) -> bytes:
         return self.public_key.public_bytes_raw()
 
@@ -157,7 +161,7 @@ class KeySet:
     key dispatches on its type via the backend.
     """
 
-    def __init__(self, keys: Iterable, backend: "Backend | None" = None):
+    def __init__(self, keys: "Iterable[KeyValue]", backend: "Backend | None" = None):
         if backend is None:
             # Deferred to break the keys <-> backends import cycle: backends
             # imports the key types from this module, so Backend can't be
@@ -166,14 +170,14 @@ class KeySet:
 
             backend = Backend()
         self.backend = backend
-        self._keys: Mapping[str, Key | KeyLike] = MappingProxyType(
+        self._keys: Mapping[str, Key | Ed25519KeyPair] = MappingProxyType(
             {k.id: k for k in map(backend.parse_key, keys)}
         )
 
-    def __getitem__(self, key: str):
+    def __getitem__(self, key: str) -> "Key | Ed25519KeyPair":
         return self._keys[key]
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[Key | Ed25519KeyPair]:
         return iter(self._keys.values())
 
     def __reversed__(self):