Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

Conflicts:
	docs/source/siteadmin/media-types.rst

2 files changed, 2 insertions, 30 deletions

diff --git a/mediagoblin/meddleware/__init__.py b/mediagoblin/meddleware/__init__.py
index a9c712d7..886c9ad9 100644
--- a/mediagoblin/meddleware/__init__.py
+++ b/mediagoblin/meddleware/__init__.py
@@ -14,10 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ENABLED_MEDDLEWARE = (
-    'mediagoblin.meddleware.noop:NoOpMeddleware',
+ENABLED_MEDDLEWARE = [
     'mediagoblin.meddleware.csrf:CsrfMeddleware',
-    )
+    ]
 
 
 class BaseMeddleware(object):
diff --git a/mediagoblin/meddleware/noop.py b/mediagoblin/meddleware/noop.py
deleted file mode 100644
index 98477706..00000000
--- a/mediagoblin/meddleware/noop.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-from mediagoblin.meddleware import BaseMeddleware
-
-
-class NoOpMeddleware(BaseMeddleware):
-
-    def process_request(self, request, controller):
-        pass
-
-    def process_response(self, request, response):
-        pass