# HG changeset patch
# User Todd Larsen <tlarsen@google.com>
# Date 1222708951 0
# Node ID 4ba836d7482929b23b51ff58e0f47f0d38de6ff7
# Parent  e076aee6e90f47e1fa65b0d6f26197d8c636f4c2
Load ../../google_appengine/ into trunk/thirdparty/google_appengine.

diff -r e076aee6e90f -r 4ba836d74829 thirdparty/google_appengine/RELEASE_NOTES
--- a/thirdparty/google_appengine/RELEASE_NOTES	Mon Sep 29 15:46:42 2008 +0000
+++ b/thirdparty/google_appengine/RELEASE_NOTES	Mon Sep 29 17:22:31 2008 +0000
@@ -3,6 +3,12 @@
 
 App Engine SDK - Release Notes
 
+Version 1.1.4 - September 26, 2008
+==================================
+
+  - Fixed issue with incorrectly escaping static_files paths on Windows.
+  - Workaround -inf not being supported on Windows in Datastore.
+
 Version 1.1.3 - September 8, 2008
 =================================
 
diff -r e076aee6e90f -r 4ba836d74829 thirdparty/google_appengine/VERSION
--- a/thirdparty/google_appengine/VERSION	Mon Sep 29 15:46:42 2008 +0000
+++ b/thirdparty/google_appengine/VERSION	Mon Sep 29 17:22:31 2008 +0000
@@ -1,3 +1,3 @@
-release: "1.1.3"
-timestamp: 1220920355
+release: "1.1.4"
+timestamp: 1222457616
 api_versions: ['1']
diff -r e076aee6e90f -r 4ba836d74829 thirdparty/google_appengine/google/appengine/api/datastore_file_stub.py
--- a/thirdparty/google_appengine/google/appengine/api/datastore_file_stub.py	Mon Sep 29 15:46:42 2008 +0000
+++ b/thirdparty/google_appengine/google/appengine/api/datastore_file_stub.py	Mon Sep 29 17:22:31 2008 +0000
@@ -594,6 +594,10 @@
 
   def _Dynamic_GetSchema(self, app_str, schema):
     minint = -sys.maxint - 1
+    try:
+      minfloat = float('-inf')
+    except ValueError:
+      minfloat = -1e300000
 
     app_str = app_str.value()
 
@@ -623,10 +627,10 @@
           if value_pb.has_stringvalue():
             value_pb.set_stringvalue('')
           if value_pb.has_doublevalue():
-            value_pb.set_doublevalue(float('-inf'))
+            value_pb.set_doublevalue(minfloat)
           if value_pb.has_pointvalue():
-            value_pb.mutable_pointvalue().set_x(float('-inf'))
-            value_pb.mutable_pointvalue().set_y(float('-inf'))
+            value_pb.mutable_pointvalue().set_x(minfloat)
+            value_pb.mutable_pointvalue().set_y(minfloat)
           if value_pb.has_uservalue():
             value_pb.mutable_uservalue().set_gaiaid(minint)
             value_pb.mutable_uservalue().set_email('')
diff -r e076aee6e90f -r 4ba836d74829 thirdparty/google_appengine/google/appengine/tools/dev_appserver.py
--- a/thirdparty/google_appengine/google/appengine/tools/dev_appserver.py	Mon Sep 29 15:46:42 2008 +0000
+++ b/thirdparty/google_appengine/google/appengine/tools/dev_appserver.py	Mon Sep 29 17:22:31 2008 +0000
@@ -1525,7 +1525,8 @@
     depth_count += 1
 
   for index in xrange(depth_count):
-    current_init_file = os.path.join(module_base, '__init__.py')
+    current_init_file = os.path.abspath(
+        os.path.join(module_base, '__init__.py'))
 
     if not isfile(current_init_file):
       missing_init_files.append(current_init_file)
@@ -1919,7 +1920,14 @@
       path = os.path.join(os.path.dirname(os.path.dirname(google.__file__)),
                           path[len(PYTHON_LIB_VAR) + 1:])
     else:
-      path = os.path.join(self._root_path, path)
+      if os.path.sep == '\\':
+        root = self._root_path.replace('\\', '\\\\')
+        if root.endswith('\\'):
+          path = root + path
+        else:
+          path = root + '\\\\' + path
+      else:
+        path = os.path.join(self._root_path, path)
 
     return path