@@ -122,7 +122,7 @@ def return_issuer(self, issuer_id):
122
122
:return: A KeyIssuer instance
123
123
"""
124
124
_iss = self ._get_issuer (issuer_id )
125
- if not _iss :
125
+ if _iss is None :
126
126
return self ._add_issuer (issuer_id )
127
127
return _iss
128
128
@@ -169,7 +169,7 @@ def add_kb(self, issuer_id, kb):
169
169
"""
170
170
issuer = self .return_issuer (issuer_id )
171
171
issuer .add_kb (kb )
172
- self [issuer_id ] = issuer
172
+ self . _issuers [issuer_id ] = issuer
173
173
174
174
@deprecated_alias (issuer = 'issuer_id' , owner = 'issuer_id' )
175
175
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):
183
183
:return: A possibly empty list of keys
184
184
"""
185
185
186
- if key_use in ["dec" , "enc" ]:
187
- use = "enc"
188
- else :
189
- use = "sig"
190
-
191
186
_issuer = None
192
187
if issuer_id != "" :
193
188
_issuer = self ._get_issuer (issuer_id )
@@ -256,22 +251,23 @@ def get_issuer_keys(self, issuer_id):
256
251
:return: A possibly empty list of keys
257
252
"""
258
253
_issuer = self ._get_issuer (issuer_id )
259
- if _issuer :
260
- return _issuer . all_keys ( )
254
+ if _issuer is None :
255
+ raise KeyError ( issuer_id )
261
256
else :
262
- return []
257
+ return _issuer . all_keys ()
263
258
264
259
@deprecated_alias (issuer = 'issuer_id' , owner = 'issuer_id' )
265
260
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 :
269
263
return False
264
+ else :
265
+ return True
270
266
271
267
@deprecated_alias (issuer = 'issuer_id' , owner = 'issuer_id' )
272
268
def __getitem__ (self , issuer_id = '' ):
273
269
"""
274
- Get all the KeyIssuer with the name == issuer_id
270
+ Get the KeyIssuer with the name == issuer_id
275
271
276
272
:param issuer_id: The entity ID
277
273
:return: A KeyIssuer instance
@@ -677,7 +673,7 @@ def load(self, info):
677
673
@deprecated_alias (issuer = 'issuer_id' , owner = 'issuer_id' )
678
674
def key_summary (self , issuer_id ):
679
675
_issuer = self ._get_issuer (issuer_id )
680
- if _issuer :
676
+ if _issuer is not None :
681
677
return _issuer .key_summary ()
682
678
683
679
raise KeyError ('Unknown Issuer ID: "{}"' .format (issuer_id ))
0 commit comments