Skip to content
This repository was archived by the owner on Jan 18, 2025. It is now read-only.

Commit 91fd90d

Browse files
committed
Addressing review comments.
1 parent f48b821 commit 91fd90d

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

oauth2client/service_account.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@ class ServiceAccountCredentials(AssertionCredentials):
133133
will be ``foo.apps.googleusercontent.com``.
134134
user_agent: string, (Optional) User agent to use when sending
135135
request.
136-
_token_uri: string, (Optional) The URI to use when requesting an
137-
access token.
138-
_revoke_uri: string, (Optional) The URI to use when revoking an
139-
access token.
140136
kwargs: dict, Extra key-value pairs (both strings) to send in the
141137
payload body when making an assertion.
142138
@@ -166,13 +162,10 @@ def __init__(self,
166162
private_key_id=None,
167163
service_account_id=None,
168164
user_agent=None,
169-
_token_uri=GOOGLE_TOKEN_URI,
170-
_revoke_uri=GOOGLE_REVOKE_URI,
171165
**kwargs):
172166

173167
super(ServiceAccountCredentials, self).__init__(
174-
None, user_agent=user_agent, token_uri=_token_uri,
175-
revoke_uri=_revoke_uri)
168+
None, user_agent=user_agent)
176169

177170
self._service_account_email = service_account_email
178171
self._private_key_pkcs8_pem = private_key_pkcs8_pem
@@ -324,12 +317,12 @@ def from_json(cls, json_str):
324317
private_key_id=data['_private_key_id'],
325318
service_account_id=data['_service_account_id'],
326319
user_agent=data['_user_agent'],
327-
_token_uri=data['token_uri'],
328-
_revoke_uri=data['revoke_uri'],
329320
**data['_kwargs']
330321
)
331322
credentials.invalid = data['invalid']
332323
credentials.access_token = data['access_token']
324+
credentials.token_uri = data['token_uri']
325+
credentials.revoke_uri = data['revoke_uri']
333326
token_expiry = data.get('token_expiry', None)
334327
if token_expiry is not None:
335328
credentials.token_expiry = datetime.datetime.strptime(

0 commit comments

Comments
 (0)