diff --git a/oauth2client/contrib/_appengine_ndb.py b/oauth2client/contrib/_appengine_ndb.py index 24f5eec08..44c0daca8 100644 --- a/oauth2client/contrib/_appengine_ndb.py +++ b/oauth2client/contrib/_appengine_ndb.py @@ -23,7 +23,7 @@ from google.appengine.ext import ndb -from oauth2client import client as client_mod +from oauth2client import client NDB_KEY = ndb.Key @@ -75,7 +75,7 @@ def _validate(self, value): TypeError if the value is not an instance of Flow. """ _LOGGER.info('validate: Got type %s', type(value)) - if value is not None and not isinstance(value, client_mod.Flow): + if value is not None and not isinstance(value, client.Flow): raise TypeError('Property %s must be convertible to a flow ' 'instance; received: %s.' % (self._name, value)) @@ -103,7 +103,7 @@ def _validate(self, value): TypeError if the value is not an instance of Credentials. """ _LOGGER.info('validate: Got type %s', type(value)) - if value is not None and not isinstance(value, client_mod.Credentials): + if value is not None and not isinstance(value, client.Credentials): raise TypeError('Property %s must be convertible to a ' 'credentials instance; received: %s.' % (self._name, value)) @@ -138,7 +138,7 @@ def _from_base_type(self, value): return None try: # Uses the from_json method of the implied class of value - credentials = client_mod.Credentials.new_from_json(value) + credentials = client.Credentials.new_from_json(value) except ValueError: credentials = None return credentials