openstack/deb-python-oauth2client
Code Issues Proposed changes

Use six when checking for strings.

Browse Source
This commit is contained in:
RM Saksida
2014-11-11 01:41:32 -02:00
parent 3956b952e0
commit bec7c53d97
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oauth2client/client.py
View File

@@ -1806,7 +1806,7 @@ class OAuth2WebServerFlow(Flow):
if code is None: if code is None:
code = device_flow_info.device_code code = device_flow_info.device_code
elif not isinstance(code, basestring): elif not isinstance(code, six.string_types):
if 'code' not in code: if 'code' not in code:
raise FlowExchangeError(code.get( raise FlowExchangeError(code.get(
'error', 'No code was supplied in the query parameters.')) 'error', 'No code was supplied in the query parameters.'))

6
oauth2client/util.py
View File

@@ -152,11 +152,7 @@ def scopes_to_string(scopes):
Returns: Returns:
The scopes formatted as a single string. The scopes formatted as a single string.
""" """
try: if isinstance(scopes, six.string_types):
is_string = isinstance(scopes, basestring)
except NameError:
is_string = isinstance(scopes, str)
if is_string:
return scopes return scopes
else: else:
return ' '.join(scopes) return ' '.join(scopes)