From 5afb97b6340c791857ef33ce0d53596105ae6b21 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 12 Jul 2018 13:30:37 +0300 Subject: [PATCH] migrate to google-auth from oauth2client --- gcal_sync/gcal.py | 19 +++++++++---------- requirements.txt | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gcal_sync/gcal.py b/gcal_sync/gcal.py index fe418e9..4d02e14 100644 --- a/gcal_sync/gcal.py +++ b/gcal_sync/gcal.py @@ -1,10 +1,11 @@ -from apiclient import discovery -import httplib2 import logging -from oauth2client import service_account -from pytz import utc import sys +import google.auth +from google.oauth2 import service_account +from googleapiclient import discovery +from pytz import utc + class GoogleCalendarService(): """class for make google calendar service Resource @@ -21,14 +22,12 @@ class GoogleCalendarService(): service Resource """ - scopes = 'https://www.googleapis.com/auth/calendar' - credentials = service_account.ServiceAccountCredentials.from_json_keyfile_name( - service_account_file, scopes=scopes) - http = credentials.authorize(httplib2.Http()) - service = discovery.build('calendar', 'v3', http=http) + scopes = ['https://www.googleapis.com/auth/calendar'] + credentials = service_account.Credentials.from_service_account_file(service_account_file) + scoped_credentials = credentials.with_scopes(scopes) + service = discovery.build('calendar', 'v3', credentials=scoped_credentials) return service - def select_event_key(event): """select event key for logging diff --git a/requirements.txt b/requirements.txt index c0173ef..6ad868d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -oauth2client==4.1.2 +google-auth-1.5.0 google-api-python-client==1.7.3 icalendar==4.0.2 pytz==2018.5