Skip to content

Commit 6e20a60

Browse files
committed
Check against None
1 parent 9d1eada commit 6e20a60

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

src/cryptojwt/key_jar.py

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def return_issuer(self, issuer_id):
122122
:return: A KeyIssuer instance
123123
"""
124124
_iss = self._get_issuer(issuer_id)
125-
if not _iss:
125+
if _iss is None:
126126
return self._add_issuer(issuer_id)
127127
return _iss
128128

@@ -169,7 +169,7 @@ def add_kb(self, issuer_id, kb):
169169
"""
170170
issuer = self.return_issuer(issuer_id)
171171
issuer.add_kb(kb)
172-
self[issuer_id] = issuer
172+
self._issuers[issuer_id] = issuer
173173

174174
@deprecated_alias(issuer='issuer_id', owner='issuer_id')
175175
def get(self, key_use, key_type="", issuer_id="", kid=None, **kwargs):
@@ -183,11 +183,6 @@ def get(self, key_use, key_type="", issuer_id="", kid=None, **kwargs):
183183
:return: A possibly empty list of keys
184184
"""
185185

186-
if key_use in ["dec", "enc"]:
187-
use = "enc"
188-
else:
189-
use = "sig"
190-
191186
_issuer = None
192187
if issuer_id != "":
193188
_issuer = self._get_issuer(issuer_id)
@@ -256,22 +251,23 @@ def get_issuer_keys(self, issuer_id):
256251
:return: A possibly empty list of keys
257252
"""
258253
_issuer = self._get_issuer(issuer_id)
259-
if _issuer:
260-
return _issuer.all_keys()
254+
if _issuer is None:
255+
raise KeyError(issuer_id)
261256
else:
262-
return []
257+
return _issuer.all_keys()
263258

264259
@deprecated_alias(issuer='issuer_id', owner='issuer_id')
265260
def __contains__(self, issuer_id):
266-
if self._get_issuer(issuer_id):
267-
return True
268-
else:
261+
_iss = self._get_issuer(issuer_id)
262+
if _iss is None:
269263
return False
264+
else:
265+
return True
270266

271267
@deprecated_alias(issuer='issuer_id', owner='issuer_id')
272268
def __getitem__(self, issuer_id=''):
273269
"""
274-
Get all the KeyIssuer with the name == issuer_id
270+
Get the KeyIssuer with the name == issuer_id
275271
276272
:param issuer_id: The entity ID
277273
:return: A KeyIssuer instance
@@ -677,7 +673,7 @@ def load(self, info):
677673
@deprecated_alias(issuer='issuer_id', owner='issuer_id')
678674
def key_summary(self, issuer_id):
679675
_issuer = self._get_issuer(issuer_id)
680-
if _issuer:
676+
if _issuer is not None:
681677
return _issuer.key_summary()
682678

683679
raise KeyError('Unknown Issuer ID: "{}"'.format(issuer_id))

0 commit comments

Comments
 (0)