From e62bb2018833bd3e52b1f27095134e08c2dc05fe Mon Sep 17 00:00:00 2001
From: Donovan Preston <donovan@lindenlab.com>
Date: Thu, 27 Mar 2008 18:43:57 +0000
Subject: [PATCH] QAR-277 svn merge -r83278:83442
svn+ssh://svn.lindenlab.com/svn/linden/branches/sqlite-backbone-merge
---
indra/lib/python/indra/base/llsd.py | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/indra/lib/python/indra/base/llsd.py b/indra/lib/python/indra/base/llsd.py
index 9e636ea4230..cc18dec2686 100644
--- a/indra/lib/python/indra/base/llsd.py
+++ b/indra/lib/python/indra/base/llsd.py
@@ -842,16 +842,6 @@ def __str__(self):
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 @@ def llsd_convert_binary(llsd_stuff, request):
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')
--
GitLab