Skip to content

Commit d96d7ae

Browse files
committed
simplify return any/all
1 parent d21e2a9 commit d96d7ae

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

src/cryptojwt/jwk/rsa.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,7 @@ def cmp_private_numbers(pn1, pn2):
208208
if not cmp_public_numbers(pn1.public_numbers, pn2.public_numbers):
209209
return False
210210

211-
for param in ["d", "p", "q"]:
212-
if getattr(pn1, param) != getattr(pn2, param):
213-
return False
214-
return True
211+
return all(getattr(pn1, param) == getattr(pn2, param) for param in ["d", "p", "q"])
215212

216213

217214
class RSAKey(AsymmetricKey):

src/cryptojwt/key_issuer.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,7 @@ def all_keys(self):
155155
return res
156156

157157
def __contains__(self, item):
158-
for kb in self._bundles:
159-
if item in kb:
160-
return True
161-
return False
158+
return any(item in kb for kb in self._bundles)
162159

163160
def items(self):
164161
_res = {}

src/cryptojwt/key_jar.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,11 +447,7 @@ def __eq__(self, other):
447447
return False
448448

449449
# Keys per issuer must be the same
450-
for iss in self.owners():
451-
if self[iss] != other[iss]:
452-
return False
453-
454-
return True
450+
return all(self[iss] == other[iss] for iss in self.owners())
455451

456452
def __delitem__(self, key):
457453
del self._issuers[key]

0 commit comments

Comments
 (0)