imported patch NDB

oauth2client/appengine.py

@@ -31,7 +31,6 @@ from google.appengine.api import app_identity
 from google.appengine.api import memcache
 from google.appengine.api import users
 from google.appengine.ext import db
-from google.appengine.ext import ndb
 from google.appengine.ext import webapp
 from google.appengine.ext.webapp.util import login_required
 from google.appengine.ext.webapp.util import run_wsgi_app
@@ -49,6 +48,13 @@ from oauth2client.client import Flow
 from oauth2client.client import OAuth2WebServerFlow
 from oauth2client.client import Storage
 
+# TODO(dhermes): Resolve import issue.
+# This is a temporary fix for a Google internal issue.
+try:
+  from google.appengine.ext import ndb
+except ImportError:
+  ndb = None
+
 logger = logging.getLogger(__name__)
 
 OAUTH2CLIENT_NAMESPACE = 'oauth2client#ns'
@@ -84,8 +90,8 @@ class SiteXsrfSecretKey(db.Model):
   """
   secret = db.StringProperty()
 
-
-class SiteXsrfSecretKeyNDB(ndb.Model):
+if ndb is not None:
+  class SiteXsrfSecretKeyNDB(ndb.Model):
     """NDB Model for storage for the sites XSRF secret key.
 
     Since this model uses the same kind as SiteXsrfSecretKey, it can be used
@@ -217,7 +223,8 @@ class FlowProperty(db.Property):
     return not value
 
 
-class FlowNDBProperty(ndb.PickleProperty):
+if ndb is not None:
+  class FlowNDBProperty(ndb.PickleProperty):
     """App Engine NDB datastore Property for Flow.
 
     Serves the same purpose as the DB FlowProperty, but for NDB models. Since
@@ -289,10 +296,11 @@ class CredentialsProperty(db.Property):
     return value
 
 
-# TODO(dhermes): Turn this into a JsonProperty and overhaul the Credentials
-#                and subclass mechanics to use new_from_dict, to_dict,
-#                from_dict, etc.
-class CredentialsNDBProperty(ndb.BlobProperty):
+if ndb is not None:
+  # TODO(dhermes): Turn this into a JsonProperty and overhaul the Credentials
+  #                and subclass mechanics to use new_from_dict, to_dict,
+  #                from_dict, etc.
+  class CredentialsNDBProperty(ndb.BlobProperty):
     """App Engine NDB datastore Property for Credentials.
 
     Serves the same purpose as the DB CredentialsProperty, but for NDB models.
@@ -385,7 +393,7 @@ class StorageByKeyName(Storage):
     # issubclass will fail if one of the arguments is not a class, only need
     # worry about new-style classes since ndb and db models are new-style
     if isinstance(self._model, type):
-      if issubclass(self._model, ndb.Model):
+      if ndb is not None and issubclass(self._model, ndb.Model):
         return True
       elif issubclass(self._model, db.Model):
         return False
@@ -469,13 +477,14 @@ class CredentialsModel(db.Model):
   credentials = CredentialsProperty()
 
 
-class CredentialsNDBModel(ndb.Model):
+if ndb is not None:
+  class CredentialsNDBModel(ndb.Model):
     """NDB Model for storage of OAuth 2.0 Credentials
 
     Since this model uses the same kind as CredentialsModel and has a property
     which can serialize and deserialize Credentials correctly, it can be used
-  interchangeably with a CredentialsModel to access, insert and delete the same
-  entities. This simply provides an NDB model for interacting with the
+    interchangeably with a CredentialsModel to access, insert and delete the
+    same entities. This simply provides an NDB model for interacting with the
     same data the DB model interacts with.
 
     Storage of the model is keyed by the user.user_id().