projects
/
twitter-api-cdsw
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added updated version of oauthlib
[twitter-api-cdsw]
/
oauthlib
/
oauth2
/
rfc6749
/
utils.py
diff --git
a/oauthlib/oauth2/rfc6749/utils.py
b/oauthlib/oauth2/rfc6749/utils.py
index 6a8e24b66c3455d60494b6d3a9d625f9482c7e5b..870ac325681e2a281d2e13b6fc985dc7e4fdba45 100644
(file)
--- a/
oauthlib/oauth2/rfc6749/utils.py
+++ b/
oauthlib/oauth2/rfc6749/utils.py
@@
-24,20
+24,16
@@
def list_to_scope(scope):
"""Convert a list of scopes to a space separated string."""
if isinstance(scope, unicode_type) or scope is None:
return scope
"""Convert a list of scopes to a space separated string."""
if isinstance(scope, unicode_type) or scope is None:
return scope
- elif isinstance(scope, (tuple, list)):
+ elif isinstance(scope, (
set,
tuple, list)):
return " ".join([unicode_type(s) for s in scope])
return " ".join([unicode_type(s) for s in scope])
- elif isinstance(scope, set):
- return list_to_scope(list(scope))
else:
else:
- raise ValueError("Invalid scope
, must be string or list."
)
+ raise ValueError("Invalid scope
(%s), must be string, tuple, set, or list." % scope
)
def scope_to_list(scope):
"""Convert a space separated string to a list of scopes."""
def scope_to_list(scope):
"""Convert a space separated string to a list of scopes."""
- if isinstance(scope,
list
):
+ if isinstance(scope,
(tuple, list, set)
):
return [unicode_type(s) for s in scope]
return [unicode_type(s) for s in scope]
- if isinstance(scope, set):
- scope_to_list(list(scope))
elif scope is None:
return None
else:
elif scope is None:
return None
else:
Benjamin Mako Hill
||
Want to submit a patch?