From 0ce30393a763628379d40bcfa667b3e05a433ec4 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 3 May 2012 11:09:06 -0400 Subject: use the same default logic for jsonp as for json --- pyramid/renderers.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pyramid/renderers.py b/pyramid/renderers.py index bdef6f561..701878264 100644 --- a/pyramid/renderers.py +++ b/pyramid/renderers.py @@ -343,12 +343,13 @@ class JSONP(JSON): def default(obj): if hasattr(obj, '__json__'): return obj.__json__(request) - - result = self.components.queryAdapter(obj, IJSONAdapter, - default=_marker) - if result is not _marker: - return result - raise TypeError('%r is not JSON serializable' % (obj,)) + obj_iface = providedBy(obj) + adapters = self.components.adapters + result = adapters.lookup((obj_iface,), IJSONAdapter, + default=_marker) + if result is _marker: + raise TypeError('%r is not JSON serializable' % (obj,)) + return result(obj, request) val = self.serializer(value, default=default, **self.kw) callback = request.GET.get(self.param_name) -- cgit v1.2.3