diff options
| author | Jonathan Huot <JonathanHuot@users.noreply.github.com> | 2018-08-12 23:44:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-12 23:44:49 +0200 |
| commit | a8df0a2b3e11626301bd260ac1ee2543d915e875 (patch) | |
| tree | 859bbe9fb229aa2608a955d4702939c76ae6ddd6 /oauthlib | |
| parent | 3a769e29c2a94bad3460ab09f748569432257396 (diff) | |
| parent | 05b118586b805f631d2f38329b3cdbd9243614a3 (diff) | |
| download | oauthlib-a8df0a2b3e11626301bd260ac1ee2543d915e875.tar.gz | |
Merge branch 'master' into get_default_redir
Diffstat (limited to 'oauthlib')
| -rw-r--r-- | oauthlib/__init__.py | 2 | ||||
| -rw-r--r-- | oauthlib/common.py | 2 | ||||
| -rw-r--r-- | oauthlib/oauth2/rfc6749/parameters.py | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/oauthlib/__init__.py b/oauthlib/__init__.py index b7586d2..bc5d96b 100644 --- a/oauthlib/__init__.py +++ b/oauthlib/__init__.py @@ -5,7 +5,7 @@ A generic, spec-compliant, thorough implementation of the OAuth request-signing logic. - :copyright: (c) 2011 by Idan Gazit. + :copyright: (c) 2018 by The OAuthlib Community :license: BSD, see LICENSE for details. """ import logging diff --git a/oauthlib/common.py b/oauthlib/common.py index f25656f..c1180e6 100644 --- a/oauthlib/common.py +++ b/oauthlib/common.py @@ -114,7 +114,7 @@ def decode_params_utf8(params): return decoded -urlencoded = set(always_safe) | set('=&;:%+~,*@!()/?') +urlencoded = set(always_safe) | set('=&;:%+~,*@!()/?\'$') def urldecode(query): diff --git a/oauthlib/oauth2/rfc6749/parameters.py b/oauthlib/oauth2/rfc6749/parameters.py index 9ea8c44..c5127e7 100644 --- a/oauthlib/oauth2/rfc6749/parameters.py +++ b/oauthlib/oauth2/rfc6749/parameters.py @@ -279,6 +279,10 @@ def parse_implicit_response(uri, state=None, scope=None): fragment = urlparse.urlparse(uri).fragment params = dict(urlparse.parse_qsl(fragment, keep_blank_values=True)) + for key in ('expires_in',): + if key in params: # cast things to int + params[key] = int(params[key]) + if 'scope' in params: params['scope'] = scope_to_list(params['scope']) |