aboutsummaryrefslogtreecommitdiff
path: root/oauth2client
diff options
context:
space:
mode:
authorNathaniel Manista <nathaniel@google.com>2016-03-03 10:14:28 -0800
committerNathaniel Manista <nathaniel@google.com>2016-03-03 10:14:28 -0800
commit15c945f1c76f0bd537b7fbcd7c09cb941ec89ceb (patch)
tree899445a5e239855a4f805f249ed476f4927ade5d /oauth2client
parentf09af4270a6108ea310069ff79bdbcf1fa75eb84 (diff)
parent6a273d678b23b63845e636c0ed6550ce0c23616a (diff)
downloadoauth2client-15c945f1c76f0bd537b7fbcd7c09cb941ec89ceb.tar.gz
Merge pull request #446 from happyspace/master
Python 3 error: step2_exchange confusing unicode/bytes.
Diffstat (limited to 'oauth2client')
-rw-r--r--oauth2client/client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/oauth2client/client.py b/oauth2client/client.py
index a388fb8..4897665 100644
--- a/oauth2client/client.py
+++ b/oauth2client/client.py
@@ -2069,7 +2069,7 @@ class OAuth2WebServerFlow(Flow):
if code is None:
code = device_flow_info.device_code
- elif not isinstance(code, six.string_types):
+ elif not isinstance(code, (six.string_types, six.binary_type)):
if 'code' not in code:
raise FlowExchangeError(code.get(
'error', 'No code was supplied in the query parameters.'))