mirror of
https://github.com/davidhalter/typeshed.git
synced 2025-12-06 04:04:25 +08:00
Loosen some types to avoid pain in real-life situations (#4870)
In this diff: * Loosen `set.__[i]sub__()` to allow typical use cases (that work at runtime). Namely, allow removing `unicode` from a set of `str`, and allow removing optional values from non-optional sets. * Avoid using union return types in `cryptography` deserialization functions. * Tune `SupportsItems` so that `dict` implements it on Python 2. Co-authored-by: Ivan Levkivskyi <ilevkivskyi@dropbox.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from abc import ABCMeta
|
||||
from enum import Enum
|
||||
from typing import Optional, Union
|
||||
from typing import Any, Optional, Union
|
||||
|
||||
from cryptography.hazmat.backends.interfaces import (
|
||||
DERSerializationBackend,
|
||||
@@ -17,19 +17,19 @@ from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPubl
|
||||
|
||||
def load_pem_private_key(
|
||||
data: bytes, password: Optional[bytes], backend: Optional[PEMSerializationBackend] = ...
|
||||
) -> Union[RSAPrivateKey, DSAPrivateKey, DHPrivateKey, EllipticCurvePrivateKey]: ...
|
||||
) -> Any: ... # actually Union[RSAPrivateKey, DSAPrivateKey, DHPrivateKey, EllipticCurvePrivateKey]
|
||||
def load_pem_public_key(
|
||||
data: bytes, backend: Optional[PEMSerializationBackend] = ...
|
||||
) -> Union[RSAPublicKey, DSAPublicKey, DHPublicKey, EllipticCurvePublicKey]: ...
|
||||
) -> Any: ... # actually Union[RSAPublicKey, DSAPublicKey, DHPublicKey, EllipticCurvePublicKey]
|
||||
def load_der_private_key(
|
||||
data: bytes, password: Optional[bytes], backend: Optional[DERSerializationBackend] = ...
|
||||
) -> Union[RSAPrivateKey, DSAPrivateKey, DHPrivateKey, EllipticCurvePrivateKey]: ...
|
||||
) -> Any: ... # actually Union[RSAPrivateKey, DSAPrivateKey, DHPrivateKey, EllipticCurvePrivateKey]
|
||||
def load_der_public_key(
|
||||
data: bytes, backend: Optional[DERSerializationBackend] = ...
|
||||
) -> Union[RSAPublicKey, DSAPublicKey, DHPublicKey, EllipticCurvePublicKey]: ...
|
||||
) -> Any: ... # actually Union[RSAPublicKey, DSAPublicKey, DHPublicKey, EllipticCurvePublicKey]
|
||||
def load_ssh_public_key(
|
||||
data: bytes, backend: Union[RSABackend, DSABackend, EllipticCurveBackend, None]
|
||||
) -> Union[RSAPublicKey, DSAPublicKey, DHPublicKey, EllipticCurvePublicKey, Ed25519PublicKey]: ...
|
||||
) -> Any: ... # actually Union[RSAPublicKey, DSAPublicKey, DHPublicKey, EllipticCurvePublicKey, Ed25519PublicKey]
|
||||
|
||||
class Encoding(Enum):
|
||||
PEM: str
|
||||
|
||||
Reference in New Issue
Block a user