From 3da5aa017afc4cab7d21f749a4b195094b098384 Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Mon, 4 Jun 2012 17:32:35 -0400
Subject: [PATCH] Kill johnny

---
 .gitignore       |  3 +--
 requirements.txt |  1 -
 settings.py      | 14 --------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 224e2b1..0644953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
 .gunicorn.pid
-.nginx.log
+*.log
 .sass-cache
 *.un~
-
 *.pgdump
 *.pyc
 
diff --git a/requirements.txt b/requirements.txt
index 23a5f62..537770e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,4 +28,3 @@ Werkzeug
 git+https://github.com/toastdriven/django-haystack.git@master#egg=django-haystack
 hg+https://bitbucket.org/ubernostrum/django-registration#egg=django-registration
 git+https://github.com/toastdriven/django-tastypie.git#egg=django-tastypie
-hg+https://bitbucket.org/jmoiron/johnny-cache#egg=johnny_cache-dev
diff --git a/settings.py b/settings.py
index 5e04318..e975029 100644
--- a/settings.py
+++ b/settings.py
@@ -216,20 +216,6 @@ ABSOLUTE_URL_OVERRIDES = {
 }
 
 # Caching
-if not DEBUG:
-    INSTALLED_APPS += ('johnny',)
-    JOHNNY_MIDDLEWARE_KEY_PREFIX='johnny_snipt'
-    MIDDLEWARE_CLASSES += (
-        'johnny.middleware.LocalStoreClearMiddleware',
-        'johnny.middleware.QueryCacheMiddleware',
-    )
-    CACHES = {
-        'default': dict(
-            BACKEND = 'johnny.backends.memcached.MemcachedCache',
-            LOCATION = ['127.0.0.1:11211'],
-            JOHNNY_CACHE = True,
-        )
-    }
 
 # CSS / JS Compression
 COMPRESS_OUTPUT_DIR = 'cache'