x/wsme
Code Issues Proposed changes

Use the new encode_result functions of the rest encoding modules

Browse Source
This commit is contained in:
Christophe de Vienne 2012-11-29 00:13:51 +01:00
parent cda8563e5a
commit 33d852b2e4
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wsme/pecan.py
View File

@ -1,10 +1,6 @@
import inspect import inspect
import sys import sys
import json
import xml.etree.ElementTree as et
import wsme import wsme
import wsme.rest.args import wsme.rest.args
import wsme.rest.json import wsme.rest.json
@ -18,11 +14,10 @@ class JSonRenderer(object):
pass pass
def render(self, template_path, namespace): def render(self, template_path, namespace):
data = wsme.rest.json.tojson( return wsme.rest.json.encode_result(
namespace['datatype'], namespace['datatype'],
namespace['result'] namespace['result']
) )
return json.dumps(data)
class XMLRenderer(object): class XMLRenderer(object):
@ -30,12 +25,10 @@ class XMLRenderer(object):
pass pass
def render(self, template_path, namespace): def render(self, template_path, namespace):
data = wsme.rest.xml.toxml( return wsme.rest.xml.encode_result(
namespace['datatype'], namespace['datatype'],
'result',
namespace['result'] namespace['result']
) )
return et.tostring(data)
pecan.templating._builtin_renderers['wsmejson'] = JSonRenderer pecan.templating._builtin_renderers['wsmejson'] = JSonRenderer
pecan.templating._builtin_renderers['wsmexml'] = XMLRenderer pecan.templating._builtin_renderers['wsmexml'] = XMLRenderer