diff --git a/addon.xml b/addon.xml index cacbe0e..eeb8c82 100644 --- a/addon.xml +++ b/addon.xml @@ -5,10 +5,10 @@ - + - + diff --git a/changelog.txt b/changelog.txt index deae5d2..59016b7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Version 1.1.1 fixed error on authorizers (missing secret/key) added ability to "catchup" on missed scheduled backup +updated google oauth and client versions Version 1.1.0 diff --git a/resources/lib/pydrive/auth.py b/resources/lib/pydrive/auth.py index dbc0c51..72ac5a5 100644 --- a/resources/lib/pydrive/auth.py +++ b/resources/lib/pydrive/auth.py @@ -3,17 +3,16 @@ import webbrowser import httplib2 import oauth2client.clientsecrets as clientsecrets -from apiclient.discovery import build +from googleapiclient.discovery import build from functools import wraps from oauth2client.client import FlowExchangeError from oauth2client.client import AccessTokenRefreshError from oauth2client.client import OAuth2WebServerFlow from oauth2client.client import OOB_CALLBACK_URN from oauth2client.file import Storage -from oauth2client.file import CredentialsFileSymbolicLinkError from oauth2client.tools import ClientRedirectHandler 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 ApiAttributeMixin from .settings import LoadSettingsFile @@ -234,7 +233,7 @@ class GoogleAuth(ApiAttributeMixin, object): try: storage = Storage(credentials_file) self.credentials = storage.get() - except CredentialsFileSymbolicLinkError: + except IOError: raise InvalidCredentialsError('Credentials file cannot be symbolic link') def SaveCredentials(self, backend=None): diff --git a/resources/lib/pydrive/files.py b/resources/lib/pydrive/files.py index e60d010..a307a84 100644 --- a/resources/lib/pydrive/files.py +++ b/resources/lib/pydrive/files.py @@ -1,8 +1,8 @@ import io import mimetypes -from apiclient import errors -from apiclient.http import MediaIoBaseUpload +from googleapiclient import errors +from googleapiclient.http import MediaIoBaseUpload from functools import wraps from .apiattr import ApiAttribute