From f3523b969e93c4bdbd202cc562499af59ac26c57 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 10 Feb 2015 16:54:22 -0500 Subject: [PATCH] Check if client exists before referencing client_id --- requests_oauthlib/oauth2_session.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requests_oauthlib/oauth2_session.py b/requests_oauthlib/oauth2_session.py index 245cb8a3..e3c33017 100644 --- a/requests_oauthlib/oauth2_session.py +++ b/requests_oauthlib/oauth2_session.py @@ -64,7 +64,9 @@ def __init__(self, client_id=None, client=None, auto_refresh_url=None, :param kwargs: Arguments to pass to the Session constructor. """ super(OAuth2Session, self).__init__(**kwargs) - self.client_id = client_id or client.client_id + self.client_id = client_id + if client is not None and not self.client_id: + self.client_id = client.client_id self.scope = scope self.redirect_uri = redirect_uri self.token = token or {}