Skip to content

Commit 0c286ec

Browse files
committed
simplify returns
1 parent d96d7ae commit 0c286ec

File tree

6 files changed

+7
-29
lines changed

6 files changed

+7
-29
lines changed

src/cryptojwt/jwk/asym.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ def has_private_key(self):
5858
5959
:return: True/False
6060
"""
61-
if self.priv_key:
62-
return True
63-
else:
64-
return False
61+
return bool(self.priv_key)
6562

6663
def public_key(self):
6764
"""

src/cryptojwt/jwk/ec.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,8 @@ def __eq__(self, other):
249249
if other.private_key():
250250
if cmp_keys(self.priv_key, other.priv_key, ec.EllipticCurvePrivateKey):
251251
return True
252-
elif self.private_key():
253-
return False
254252
else:
255-
return True
253+
return not self.private_key()
256254

257255
return False
258256

src/cryptojwt/jwk/okp.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,8 @@ def __eq__(self, other):
278278
if other.private_key():
279279
if cmp_keys(self.priv_key, other.priv_key, _private_cls):
280280
return True
281-
elif self.private_key():
282-
return False
283281
else:
284-
return True
282+
return not self.private_key()
285283

286284
return False
287285

src/cryptojwt/jwk/rsa.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,7 @@ def rsa_eq(key1, key2):
117117
:param key2:
118118
:return:
119119
"""
120-
pn1 = key1.public_numbers()
121-
pn2 = key2.public_numbers()
122-
# Check if two RSA keys are in fact the same
123-
if pn1 == pn2:
124-
return True
125-
else:
126-
return False
120+
return key1.public_numbers() == key2.public_numbers()
127121

128122

129123
def x509_rsa_load(txt):

src/cryptojwt/key_jar.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,7 @@ def get_issuer_keys(self, issuer_id):
256256
@deprecated_alias(issuer="issuer_id", owner="issuer_id")
257257
def __contains__(self, issuer_id):
258258
_iss = self._get_issuer(issuer_id)
259-
if _iss is None:
260-
return False
261-
else:
262-
return True
259+
return not _iss is None
263260

264261
@deprecated_alias(issuer="issuer_id", owner="issuer_id")
265262
def __getitem__(self, issuer_id=""):

src/cryptojwt/simple_jwt.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,9 @@ def verify_header(self, key, val):
111111
"""
112112

113113
if isinstance(val, list):
114-
if self.headers[key] in val:
115-
return True
116-
else:
117-
return False
114+
return self.headers[key] in val
118115
else:
119-
if self.headers[key] == val:
120-
return True
121-
else:
122-
return False
116+
return self.headers[key] == val
123117

124118
def verify_headers(self, check_presence=True, **kwargs):
125119
"""

0 commit comments

Comments
 (0)