From 4a8ebf411cb238f5e1a56336943540f676e278f2 Mon Sep 17 00:00:00 2001
From: Keith Mitchell <kemitche@reddit.com>
Date: Thu, 20 Dec 2012 11:01:11 -0800
Subject: [PATCH] Remove underused json_respond

This should help resolve a circular import wherein "import jsonresponse"
triggers "from r2.lib.pages.things import wrap_links" in jsonresponse.py,
which triggers "from pages import *" in r2/lib/pages/__init__.py, which
further triggers "from r2.lib.jsonresponse import json_respond" in pages.py
---
 r2/r2/controllers/validator/validator.py | 2 +-
 r2/r2/lib/jsonresponse.py                | 6 ------
 r2/r2/lib/pages/pages.py                 | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/r2/r2/controllers/validator/validator.py b/r2/r2/controllers/validator/validator.py
index d9a723bf8..62a7edb5d 100644
--- a/r2/r2/controllers/validator/validator.py
+++ b/r2/r2/controllers/validator/validator.py
@@ -30,7 +30,7 @@ from r2.lib.filters import markdown_souptest
 from r2.lib.db import tdb_cassandra
 from r2.lib.db.operators import asc, desc
 from r2.lib.template_helpers import add_sr
-from r2.lib.jsonresponse import json_respond, JQueryResponse, JsonResponse
+from r2.lib.jsonresponse import JQueryResponse, JsonResponse
 from r2.lib.log import log_text
 from r2.models import *
 from r2.lib.authorize import Address, CreditCard
diff --git a/r2/r2/lib/jsonresponse.py b/r2/r2/lib/jsonresponse.py
index eb8485509..abffa43ef 100644
--- a/r2/r2/lib/jsonresponse.py
+++ b/r2/r2/lib/jsonresponse.py
@@ -32,12 +32,6 @@ from r2.models import IDBuilder, Listing
 import simplejson
 from pylons import c, g
 
-def json_respond(x):
-    if g.debug:
-        return websafe_json(simplejson.dumps(x or '',
-                                             sort_keys=True, indent=4))
-    else:
-        return websafe_json(simplejson.dumps(x or ''))
 
 class JsonResponse(object):
     """
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 73e6cf136..d10a82fe7 100755
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -35,7 +35,6 @@ from r2.models import Thing
 from r2.config import cache
 from r2.config.extensions import is_api
 from r2.lib.menus import CommentSortMenu
-from r2.lib.jsonresponse import json_respond
 from pylons.i18n import _, ungettext
 from pylons import c, request, g
 from pylons.controllers.util import abort
@@ -89,7 +88,7 @@ def responsive(res, space_compress = False):
     controller so that it becomes compatible with the page cache.
     """
     if is_api():
-        res = json_respond(res)
+        res = websafe_json(simplejson.dumps(res or ''))
         if c.allowed_callback:
             res = "%s(%s)" % (websafe_json(c.allowed_callback), res)
     elif space_compress: