updated for google oauth and googleapi version bumps

This commit is contained in:
Rob Weber 2017-11-22 15:38:06 -06:00
parent 009d67d65b
commit 87b1a832c5
4 changed files with 8 additions and 8 deletions

View File

@ -5,10 +5,10 @@
<!-- jarvis --> <!-- jarvis -->
<import addon="xbmc.python" version="2.24.0"/> <import addon="xbmc.python" version="2.24.0"/>
<import addon="script.module.httplib2" version="0.8.0" /> <import addon="script.module.httplib2" version="0.8.0" />
<import addon="script.module.oauth2client" version="1.4.11" /> <import addon="script.module.oauth2client" version="4.1.2" />
<import addon="script.module.uritemplate" version="0.6" /> <import addon="script.module.uritemplate" version="0.6" />
<import addon="script.module.yaml" version="3.11"/> <import addon="script.module.yaml" version="3.11"/>
<import addon="script.module.googleapi" version="1.4.2" /> <import addon="script.module.googleapi" version="1.6.4" />
<import addon="script.module.requests" version="2.9.1" /> <import addon="script.module.requests" version="2.9.1" />
</requires> </requires>
<extension point="xbmc.python.script" library="default.py"> <extension point="xbmc.python.script" library="default.py">

View File

@ -2,6 +2,7 @@ Version 1.1.1
fixed error on authorizers (missing secret/key) fixed error on authorizers (missing secret/key)
added ability to "catchup" on missed scheduled backup added ability to "catchup" on missed scheduled backup
updated google oauth and client versions
Version 1.1.0 Version 1.1.0

View File

@ -3,17 +3,16 @@ import webbrowser
import httplib2 import httplib2
import oauth2client.clientsecrets as clientsecrets import oauth2client.clientsecrets as clientsecrets
from apiclient.discovery import build from googleapiclient.discovery import build
from functools import wraps from functools import wraps
from oauth2client.client import FlowExchangeError from oauth2client.client import FlowExchangeError
from oauth2client.client import AccessTokenRefreshError from oauth2client.client import AccessTokenRefreshError
from oauth2client.client import OAuth2WebServerFlow from oauth2client.client import OAuth2WebServerFlow
from oauth2client.client import OOB_CALLBACK_URN from oauth2client.client import OOB_CALLBACK_URN
from oauth2client.file import Storage from oauth2client.file import Storage
from oauth2client.file import CredentialsFileSymbolicLinkError
from oauth2client.tools import ClientRedirectHandler from oauth2client.tools import ClientRedirectHandler
from oauth2client.tools import ClientRedirectServer from oauth2client.tools import ClientRedirectServer
from oauth2client.util import scopes_to_string from oauth2client._helpers import scopes_to_string
from .apiattr import ApiAttribute from .apiattr import ApiAttribute
from .apiattr import ApiAttributeMixin from .apiattr import ApiAttributeMixin
from .settings import LoadSettingsFile from .settings import LoadSettingsFile
@ -234,7 +233,7 @@ class GoogleAuth(ApiAttributeMixin, object):
try: try:
storage = Storage(credentials_file) storage = Storage(credentials_file)
self.credentials = storage.get() self.credentials = storage.get()
except CredentialsFileSymbolicLinkError: except IOError:
raise InvalidCredentialsError('Credentials file cannot be symbolic link') raise InvalidCredentialsError('Credentials file cannot be symbolic link')
def SaveCredentials(self, backend=None): def SaveCredentials(self, backend=None):

View File

@ -1,8 +1,8 @@
import io import io
import mimetypes import mimetypes
from apiclient import errors from googleapiclient import errors
from apiclient.http import MediaIoBaseUpload from googleapiclient.http import MediaIoBaseUpload
from functools import wraps from functools import wraps
from .apiattr import ApiAttribute from .apiattr import ApiAttribute