Skip to content

Commit 46302d7

Browse files
beebeeepblag
authored andcommitted
Allow using secret of type "bytes"
1 parent 2ebdb3f commit 46302d7

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

jose/jws.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -229,24 +229,23 @@ def _get_keys(key):
229229
except Exception:
230230
pass
231231

232-
# JWK Set per RFC 7517
233-
if 'keys' in key:
234-
return key['keys']
235-
236-
# Individual JWK per RFC 7517
237-
elif 'kty' in key:
238-
return (key,)
239-
240-
# Some other mapping. Firebase uses just dict of kid, cert pairs
241-
elif isinstance(key, Mapping):
242-
values = key.values()
243-
if values:
244-
return values
245-
return (key,)
232+
if isinstance(key, Mapping):
233+
if 'keys' in key:
234+
# JWK Set per RFC 7517
235+
return key['keys']
236+
elif 'kty' in key:
237+
# Individual JWK per RFC 7517
238+
return (key,)
239+
else:
240+
# Some other mapping. Firebase uses just dict of kid, cert pairs
241+
values = key.values()
242+
if values:
243+
return values
244+
return (key,)
246245

247246
# Iterable but not text or mapping => list- or tuple-like
248247
elif (isinstance(key, Iterable) and
249-
not (isinstance(key, six.string_types) or isinstance(key, Mapping))):
248+
not (isinstance(key, six.string_types) or isinstance(key, six.binary_type))):
250249
return key
251250

252251
# Scalar value, wrap in tuple.

0 commit comments

Comments
 (0)