diff options
author | Mark Adams <mark@markadams.me> | 2015-04-12 10:47:32 -0500 |
---|---|---|
committer | Mark Adams <mark@markadams.me> | 2015-04-12 13:29:26 -0500 |
commit | 67de95326a8599d105e5c0b2b5b7a6aaa42c0161 (patch) | |
tree | c3425d7d6cc48082c79a702dcb02689d67800360 | |
parent | 951dddfbcd840c51b8b4a64af68b7b6553a3c72c (diff) | |
download | pyjwt-67de95326a8599d105e5c0b2b5b7a6aaa42c0161.tar.gz |
Optimized _merge_options and changed some variable names
-rw-r--r-- | jwt/api.py | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -127,7 +127,7 @@ class PyJWT(object): payload, signing_input, header, signature = self._load(jwt) if verify: - merged_options = self._merge_options(self.options, override_options=options) + merged_options = self._merge_options(self.options, options) if merged_options.get('verify_signature'): self._verify_signature(payload, signing_input, header, signature, key, algorithms) @@ -248,16 +248,16 @@ class PyJWT(object): if payload.get('iss') != issuer: raise InvalidIssuerError('Invalid issuer') - def _merge_options(self, default_options=None, override_options=None): - if not default_options: - default_options = {} + def _merge_options(self, original=None, updates=None): + if not original: + original = {} - if not override_options: - override_options = {} + if not updates: + return original try: - merged_options = default_options.copy() - merged_options.update(override_options) + merged_options = original.copy() + merged_options.update(updates) except (AttributeError, ValueError) as e: raise TypeError('options must be a dictionary: %s' % e) |