casa-mp-base

Description: Fix incompatibilities with python-oauth2client >= 2.x

​

--- gcalcli 2015-09-14 01:26:55.000000000 -0400

+++ gcalcli 2016-03-25 05:59:33.777216098 -0400

@@ -194,7 +194,8 @@

     from apiclient.errors import HttpError

     from oauth2client.file import Storage

     from oauth2client.client import OAuth2WebServerFlow

-    from oauth2client.tools import run

+    from oauth2client.tools import run_flow

+    from oauth2client.tools import argparser

 except ImportError as e:

     print "ERROR: Missing module - %s" % e.args[0]

     sys.exit(1)

@@ -673,14 +674,15 @@

             credentials = storage.get()

             if credentials is None or credentials.invalid:

-                credentials = run(

+                args, unknown = argparser.parse_known_args(sys.argv)

+                credentials = run_flow(

                     OAuth2WebServerFlow(

                         client_id=self.client_id,

                         client_secret=self.client_secret,

                         scope=['https://www.googleapis.com/auth/calendar',

                                'https://www.googleapis.com/auth/urlshortener'],

                         user_agent=__program__ + '/' + __version__),

-                    storage)

+                    storage, args)

             self.authHttp = credentials.authorize(httplib2.Http())