Skip to content
This repository was archived by the owner on Mar 6, 2026. It is now read-only.

Commit fb52796

Browse files
committed
removed import check in __init__
1 parent a11cb0f commit fb52796

2 files changed

Lines changed: 21 additions & 29 deletions

File tree

google/auth/crypt/__init__.py

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,33 +40,13 @@
4040
from google.auth.crypt import base
4141
from google.auth.crypt import rsa
4242

43-
# google.auth.crypt.es depends on the crytpography module which may not be
44-
# successfully imported depending on the system.
45-
try:
46-
from google.auth.crypt import es
47-
from google.auth.crypt import es256
48-
except ImportError: # pragma: NO COVER
49-
es = None # type: ignore
50-
es256 = None # type: ignore
51-
52-
if es is not None and es256 is not None: # pragma: NO COVER
53-
__all__ = [
54-
"EsSigner",
55-
"EsVerifier",
56-
"ES256Signer",
57-
"ES256Verifier",
58-
"RSASigner",
59-
"RSAVerifier",
60-
"Signer",
61-
"Verifier",
62-
]
63-
64-
EsSigner = es.EsSigner
65-
EsVerifier = es.EsVerifier
66-
ES256Signer = es256.ES256Signer
67-
ES256Verifier = es256.ES256Verifier
68-
else: # pragma: NO COVER
69-
__all__ = ["RSASigner", "RSAVerifier", "Signer", "Verifier"]
43+
from google.auth.crypt import es
44+
from google.auth.crypt import es256
45+
46+
EsSigner = es.EsSigner
47+
EsVerifier = es.EsVerifier
48+
ES256Signer = es256.ES256Signer
49+
ES256Verifier = es256.ES256Verifier
7050

7151

7252
# Aliases to maintain the v1.0.0 interface, as the crypt module was split
@@ -103,3 +83,15 @@ class to use for verification. This can be used to select different
10383
if verifier.verify(message, signature):
10484
return True
10585
return False
86+
87+
88+
__all__ = [
89+
"EsSigner",
90+
"EsVerifier",
91+
"ES256Signer",
92+
"ES256Verifier",
93+
"RSASigner",
94+
"RSAVerifier",
95+
"Signer",
96+
"Verifier",
97+
]

google/auth/crypt/es.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ def verify(self, message: bytes, signature: bytes) -> bool:
102102

103103
@classmethod
104104
def from_string(cls, public_key: Union[str, bytes]) -> "EsVerifier":
105-
"""Construct an Verifier instance from a public key or public
105+
"""Construct a Verifier instance from a public key or public
106106
certificate string.
107107
108108
Args:
109109
public_key (Union[str, bytes]): The public key in PEM format or the
110110
x509 public key certificate.
111111
112112
Returns:
113-
Verifier: The constructed verifier.
113+
google.auth.crypt.Verifier: The constructed verifier.
114114
115115
Raises:
116116
ValueError: If the public key can't be parsed.

0 commit comments

Comments
 (0)