From 79446e2f600b11149689e563e6decf02046e44d3 Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Mon, 13 Aug 2012 09:56:27 -0700
Subject: [PATCH] query_cache: Clean up cjson remnants.

It was removed because it's actually rather buggy.
---
 install-reddit.sh             | 1 -
 r2/r2/lib/db/tdb_cassandra.py | 3 +--
 r2/r2/models/query_cache.py   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/install-reddit.sh b/install-reddit.sh
index 093b2d1bd..49e6f054d 100755
--- a/install-reddit.sh
+++ b/install-reddit.sh
@@ -132,7 +132,6 @@ python-bcrypt
 python-python-statsd
 python-snudown
 python-l2cs
-python-cjson
 python-lxml
 
 gettext
diff --git a/r2/r2/lib/db/tdb_cassandra.py b/r2/r2/lib/db/tdb_cassandra.py
index 4ef6f4a8e..fd2e175de 100644
--- a/r2/r2/lib/db/tdb_cassandra.py
+++ b/r2/r2/lib/db/tdb_cassandra.py
@@ -20,6 +20,7 @@
 # Inc. All Rights Reserved.
 ###############################################################################
 
+import json
 import inspect
 import pytz
 from datetime import datetime
@@ -56,8 +57,6 @@ debug = g.debug
 make_lock = g.make_lock
 db_create_tables = g.db_create_tables
 
-import json
-
 thing_types = {}
 
 TRANSIENT_EXCEPTIONS = (MaximumRetryException,)
diff --git a/r2/r2/models/query_cache.py b/r2/r2/models/query_cache.py
index 385a65555..7b48c87ac 100644
--- a/r2/r2/models/query_cache.py
+++ b/r2/r2/models/query_cache.py
@@ -32,6 +32,7 @@ jobs.
 
 """
 
+import json
 import random
 import datetime
 import collections
@@ -45,7 +46,6 @@ from r2.lib.db import tdb_cassandra
 from r2.lib.db.operators import asc
 from r2.lib.db.sorts import epoch_seconds
 from r2.lib.utils import flatten, to36
-from r2.lib.db.tdb_cassandra import json
 
 
 CONNECTION_POOL = g.cassandra_pools['main']