From a69bc44314ca54bed6def59267a661cb168de6b7 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 15 Nov 2012 12:29:28 -0600 Subject: [PATCH] fixed generic.xml --- VERSION | 2 +- applications/examples/views/generic.xml | 16 +--------------- applications/welcome/views/generic.xml | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/VERSION b/VERSION index 9bb1aa4d..f79b8aa6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.2.1 (2012-11-14 15:33:12) stable +Version 2.2.1 (2012-11-15 12:29:21) stable diff --git a/applications/examples/views/generic.xml b/applications/examples/views/generic.xml index 4a0681bd..234b4055 100644 --- a/applications/examples/views/generic.xml +++ b/applications/examples/views/generic.xml @@ -1,15 +1 @@ -{{ -### -# response._vars contains the dictionary returned by thecontroller action -### -try: - from gluon.serializers import xml - response.write(xml(response._vars), escape=False) - response.headers['Content-Type'] = 'text/xml' -except (TypeError, ValueError): - raise HTTP(405, 'XML serialization error') -except ImportError: - raise HTTP(405, 'XML not available') -except: - raise HTTP(405, 'XML error') -}} +{{from gluon.serializers import xml}}{{=XML(xml(response._vars,quote=False))}} diff --git a/applications/welcome/views/generic.xml b/applications/welcome/views/generic.xml index b4a11d9e..234b4055 100644 --- a/applications/welcome/views/generic.xml +++ b/applications/welcome/views/generic.xml @@ -1 +1 @@ -{{from gluon.serializers import xml}}{{=XML(xml(response._vars,quote=False))}} +{{from gluon.serializers import xml}}{{=XML(xml(response._vars,quote=False))}}