dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

synced with gluino

Browse Source
This commit is contained in:
mdipierro
2013-07-09 16:15:21 -05:00
parent 89e158cd1d
commit cadf0e946a
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -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
+5 -2
View File
@@ -39,9 +39,12 @@ import re
import cStringIO import cStringIO
from gluon import current, redirect from gluon import current, redirect
import inspect 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
+2 -2
View File
@@ -800,8 +800,8 @@ class DummyResponse():
def write(self, data, escape=True): def write(self, data, escape=True):
if not escape: if not escape:
self.body.write(str(data)) self.body.write(str(data))
elif hasattr(data, 'as_html') and callable(data.as_html): elif hasattr(data, 'xml') and callable(data.xml):
self.body.write(data.as_html()) self.body.write(data.xml())
else: else:
# make it a string # make it a string
if not isinstance(data, (str, unicode)): if not isinstance(data, (str, unicode)):