synced with gluino

VERSION

@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.08.08.46.42
+Version 2.6.0-development+timestamp.2013.07.09.16.14.32

gluon/sqlhtml.py

@@ -39,9 +39,12 @@ import re
 import cStringIO
 from gluon import current, redirect
 import inspect
-import settings
-is_gae = settings.global_settings.web2py_runtime_gae
 
+try:
+    import settings
+    is_gae = settings.global_settings.web2py_runtime_gae
+except ImportError:
+    is_gae = False
 
 
 

gluon/template.py

@@ -800,8 +800,8 @@ class DummyResponse():
     def write(self, data, escape=True):
         if not escape:
             self.body.write(str(data))
-        elif hasattr(data, 'as_html') and callable(data.as_html):
-            self.body.write(data.as_html())
+        elif hasattr(data, 'xml') and callable(data.xml):
+            self.body.write(data.xml())
         else:
             # make it a string
             if not isinstance(data, (str, unicode)):