Skip to content

Commit 951c390

Browse files
committed
Wrap scalar values in tuples instead of lists
1 parent a72158c commit 951c390

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

jose/jws.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ def _get_keys(key):
222222
elif (isinstance(key, Iterable) and
223223
not (isinstance(key, six.string_types) or isinstance(key, Mapping))):
224224
return key
225-
else: # Scalar value, wrap in list.
226-
return [key]
225+
else: # Scalar value, wrap in tuple.
226+
return (key,)
227227

228228

229229
def _verify_signature(signing_input, header, signature, key='', algorithms=None):

jose/jwt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ def _validate_iss(claims, issuer=None):
351351

352352
if issuer is not None:
353353
if isinstance(issuer, string_types):
354-
issuer = [issuer]
354+
issuer = (issuer,)
355355
if claims.get('iss') not in issuer:
356356
raise JWTClaimsError('Invalid issuer')
357357

tests/test_jws.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,13 @@ def jwk_set():
201201
class TestGetKeys(object):
202202

203203
def test_dict(self):
204-
assert [{}] == jws._get_keys({})
204+
assert ({},) == jws._get_keys({})
205205

206206
def test_custom_object(self):
207207
class MyDict(dict):
208208
pass
209209
mydict = MyDict()
210-
assert [mydict] == jws._get_keys(mydict)
210+
assert (mydict,) == jws._get_keys(mydict)
211211

212212
def test_RFC7517_string(self):
213213
key = '{"keys": [{}, {}]}'
@@ -218,7 +218,7 @@ def test_RFC7517_mapping(self):
218218
assert [{}, {}] == jws._get_keys(key)
219219

220220
def test_string(self):
221-
assert ['test'] == jws._get_keys('test')
221+
assert ('test',) == jws._get_keys('test')
222222

223223
def test_tuple(self):
224224
assert ('test', 'key') == jws._get_keys(('test', 'key'))

0 commit comments

Comments
 (0)