livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QAR-277 svn merge -r83278:83442 svn+ssh://svn.lindenlab.com/svn/linden/branches/sqlite-backbone-merge

meow-7.2.2
Donovan Preston 2008-03-27 18:43:57 +00:00
parent c5523188c0
commit e62bb20188
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/lib/python/indra/base/llsd.py
View File

@ -842,16 +842,6 @@ try:
except:
print "Couldn't import mulib.stacked, not registering LLSD converters"
else:
def llsd_convert_json(llsd_stuff, request):
callback = request.get_header('callback')
if callback is not None:
## See Yahoo's ajax documentation for information about using this
## callback style of programming
## http://developer.yahoo.com/common/json.html#callbackparam
req.write("%s(%s)" % (callback, simplejson.dumps(llsd_stuff)))
else:
req.write(simplejson.dumps(llsd_stuff))
def llsd_convert_xml(llsd_stuff, request):
request.write(format_xml(llsd_stuff))
@ -859,8 +849,6 @@ else:
request.write(format_binary(llsd_stuff))
for typ in [LLSD, dict, list, tuple, str, int, float, bool, unicode, type(None)]:
stacked.add_producer(typ, llsd_convert_json, 'application/json')
stacked.add_producer(typ, llsd_convert_xml, 'application/llsd+xml')
stacked.add_producer(typ, llsd_convert_xml, 'application/xml')
stacked.add_producer(typ, llsd_convert_xml, 'text/xml')