Updating Compat Layer

Author: Bryan Mau

appengine-compat/exported_appengine_sdk/google/appengine/api/appinfo.py

@@ -46,14 +46,12 @@
 
 
 if os.environ.get('APPENGINE_RUNTIME') == 'python27':
-  from google.appengine.api import pagespeedinfo
   from google.appengine.api import validation
   from google.appengine.api import yaml_builder
   from google.appengine.api import yaml_listener
   from google.appengine.api import yaml_object
 else:
 
-  from google.appengine.api import pagespeedinfo
   from google.appengine.api import validation
   from google.appengine.api import yaml_builder
   from google.appengine.api import yaml_listener
@@ -272,7 +270,6 @@
 API_CONFIG = 'api_config'
 CODE_LOCK = 'code_lock'
 ENV_VARIABLES = 'env_variables'
-PAGESPEED = 'pagespeed'
 
 SOURCE_REPO_RE_STRING = r'^[a-z][a-z0-9\-\+\.]*:[^#]*$'
 SOURCE_REVISION_RE_STRING = r'^[0-9a-fA-F]+$'
@@ -1874,7 +1871,6 @@ class AppInfoExternal(validation.Validated):
       API_CONFIG: validation.Optional(ApiConfigHandler),
       CODE_LOCK: validation.Optional(bool),
       ENV_VARIABLES: validation.Optional(EnvironmentVariables),
-      PAGESPEED: validation.Optional(pagespeedinfo.PagespeedEntry),
   }
 
   def CheckInitialized(self):

appengine-compat/exported_appengine_sdk/google/appengine/api/pagespeedinfo.py

@@ -178,7 +178,7 @@ def dump_all_pending(self, verbose=False):
       pending.append(line)
     return '\n'.join(pending)
 
-  def reset(self):
+  def reset(self, unused_req_id):
     self.current_context = None
     ev = eventloop.get_event_loop()
     ev.clear()

appengine-compat/exported_appengine_sdk/google/appengine/ext/ndb/tasklets.py

@@ -36,27 +36,27 @@ def SetRequestEndCallback(callback):
   Args:
     callback: A zero-argument callable whose return value is unused.
   """
-  key = _GetRequestId()
+  req_id = GetRequestId()
 
 
 
 
-  if key:
-    _callback_storage.setdefault(key, []).append(callback)
+  if req_id:
+    _callback_storage.setdefault(req_id, []).append(callback)
 
 
 def InvokeCallbacks():
   """Invokes the callbacks associated with the current request ID."""
 
-  key = _GetRequestId()
-  if key in _callback_storage:
-    for callback in _callback_storage[key]:
-      callback()
+  req_id = GetRequestId()
+  if req_id in _callback_storage:
+    for callback in _callback_storage[req_id]:
+      callback(req_id)
 
-    del _callback_storage[key]
+    del _callback_storage[req_id]
 
 
-def _GetRequestId():
+def GetRequestId():
   """Returns a unique ID using the cloud trace ID."""
   if REQUEST_ID_KEY in os.environ:
     return os.environ[REQUEST_ID_KEY]

appengine-compat/exported_appengine_sdk/google/appengine/ext/vmruntime/callback.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+"""A Request-Local object.  Note, these objects are not thread-local."""
+
+
+
+import UserDict
+
+from google.appengine.ext.vmruntime import callback
+
+
+class RequestLocal(object):
+  """A replica of threading.local objects except across requests.
+
+  RequestLocal objects, unlike thread-local objects, can and often are
+  created outside the context of any requests.  In such scenarios, any
+  attributes set outside a request are considered global attributes that can
+  be accessed by any request.
+  """
+
+  def __getattribute__(self, name):
+    request_id = callback.GetRequestId()
+    my_dict = object.__getattribute__(self, '__dict__')
+
+
+    if request_id and name in my_dict.setdefault(request_id, {}):
+      return my_dict[request_id][name]
+
+
+    return object.__getattribute__(self, name)
+
+  def __setattr__(self, name, value):
+    request_id = callback.GetRequestId()
+    my_dict = object.__getattribute__(self, '__dict__')
+
+    if request_id:
+      if request_id in my_dict:
+        my_dict[request_id][name] = value
+      else:
+
+        callback.SetRequestEndCallback(
+            object.__getattribute__(self, '_cleanup'))
+        my_dict[request_id] = {name: value}
+    else:
+
+      my_dict[name] = value
+
+  def __delattr__(self, name):
+    request_id = callback.GetRequestId()
+    my_dict = object.__getattribute__(self, '__dict__')
+
+
+    if not request_id:
+      object.__delattr__(self, name)
+      return
+
+
+    if name in my_dict.setdefault(request_id, {}):
+      del my_dict[request_id][name]
+    elif object.__hasattr__(self, name):
+      raise AttributeError('Cannot delete global attribute "%s"' % name)
+    else:
+      raise AttributeError('%s has no attribute "%s"' % (self, name))
+
+  def _cleanup(self, req_id):
+    my_dict = object.__getattribute__(self, '__dict__')
+    del my_dict[req_id]
+
+
+class RequestLocalDict(UserDict.IterableUserDict, RequestLocal):
+  """A dictionary with request-local contents."""