@@ -73,6 +73,8 @@ class SiteResource(resource.Resource): class JSONSiteResource(SiteResource): "Automatically handles JSON encoding and decoding and headers." def render(self, request): + request.setHeader("Content-type", + 'application/json; charset=utf-8') try: # handle incoming data if settings.DEBUG: print '\n', request.path @@ -82,20 +84,14 @@ class JSONSiteResource(SiteResource): if settings.DEBUG: print content if settings.DEBUG: print db.session # handle outgoing data - request.setHeader("Content-type", - 'application/json; charset=utf-8') body = SiteResource.render(self, request) except Http404, h: if settings.DEBUG: traceback.print_exc() request.setResponseCode(http.NOT_FOUND) - request.setHeader("Content-type", - 'application/json; charset=utf-8') body = {'error': str(h)} except Exception, e: # *** this might catch too much if settings.DEBUG: traceback.print_exc() request.setResponseCode(http.INTERNAL_SERVER_ERROR) - request.setHeader("Content-type", - 'application/json; charset=utf-8') body = {'error': str(e)} else: db.commit() ripplebase/resource.py b260386cc56ea4bdb5acaf0bd67d358e5f7262ca Dan Helfman witten@torsion.org http://github.com/rfugger/ripple/commit/b6431c26e412e43d2cafdd6081211e561107aa84 b6431c26e412e43d2cafdd6081211e561107aa84 2008-07-18T20:43:25-07:00 2008-07-18T20:43:25-07:00 Factored out setting of Content-type to application/json since it was done in three places. 1fe1ad361a91946acfa3bccc216ab8757bb82f01 Dan Helfman witten@torsion.org