Remove beaker stuff from the code.

This is all obsoleted by It's Dangerous.

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index fe8e8c4b96dfff4f2437ead364bbca382a8b2217..2c772fe11e420689e28dda4238bffaed20100ba4 100644 (file)
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -34,7 +34,7 @@ from mediagoblin.init.celery import setup_celery_from_config
 from mediagoblin.init.plugins import setup_plugins
 from mediagoblin.init import (get_jinja_loader, get_staticdirector,
     setup_global_and_app_config, setup_locales, setup_workbench, setup_database,
-    setup_storage, setup_beaker_cache)
+    setup_storage)
 from mediagoblin.tools.pluginapi import PluginManager
 from mediagoblin.tools.crypto import setup_crypto
 
@@ -103,9 +103,6 @@ class MediaGoblinApp(object):
         # set up staticdirector tool
         self.staticdirector = get_staticdirector(app_config)
 
-        # set up caching
-        self.cache = setup_beaker_cache()
-
         # Setup celery, if appropriate
         if setup_celery and not app_config.get('celery_setup_elsewhere'):
             if os.environ.get('CELERY_ALWAYS_EAGER', 'false').lower() == 'true':

diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index 7c832442ce75fbd29eaf368bfa010c434d75d7b8..d16027db62385cc2a5382493e1268b71ddcb23de 100644 (file)
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -14,8 +14,6 @@
 # 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 beaker.cache import CacheManager
-from beaker.util import parse_cache_config_options
 import jinja2
 
 from mediagoblin.tools import staticdirect
@@ -146,16 +144,3 @@ def setup_workbench():
     workbench_manager = WorkbenchManager(app_config['workbench_path'])
 
     setup_globals(workbench_manager=workbench_manager)
-
-
-def setup_beaker_cache():
-    """
-    Setup the Beaker Cache manager.
-    """
-    cache_config = mg_globals.global_config['beaker.cache']
-    cache_config = dict(
-        [(u'cache.%s' % key, value)
-         for key, value in cache_config.iteritems()])
-    cache = CacheManager(**parse_cache_config_options(cache_config))
-    setup_globals(cache=cache)
-    return cache

diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py
index e4b94bdc677ce457c07de51c6399b096aa45e275..26ed66fab87eedae3fcfb22210e9efb114457c65 100644 (file)
--- a/mediagoblin/mg_globals.py
+++ b/mediagoblin/mg_globals.py
@@ -29,9 +29,6 @@ import threading
 # SQL database engine
 database = None
 
-# beaker's cache manager
-cache = None
-
 # should be the same as the 
 public_store = None
 queue_store = None

diff --git a/mediagoblin/tests/test_cache.py b/mediagoblin/tests/test_cache.py
deleted file mode 100644 (file)
index 48fa138..0000000
--- a/mediagoblin/tests/test_cache.py
+++ /dev/null
@@ -1,52 +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.tests.tools import setup_fresh_app
-from mediagoblin import mg_globals
-
-
-DATA_TO_CACHE = {
-    'herp': 'derp',
-    'lol': 'cats'}
-
-
-def _get_some_data(key):
-    """
-    Stuid function that makes use of some caching.
-    """
-    some_data_cache = mg_globals.cache.get_cache('sum_data')
-    if some_data_cache.has_key(key):
-        return some_data_cache.get(key)
-
-    value = DATA_TO_CACHE.get(key)
-    some_data_cache.put(key, value)
-    return value
-
-
-@setup_fresh_app
-def test_cache_working(test_app):
-    some_data_cache = mg_globals.cache.get_cache('sum_data')
-    assert not some_data_cache.has_key('herp')
-    assert _get_some_data('herp') == 'derp'
-    assert some_data_cache.get('herp') == 'derp'
-    # should get the same value again
-    assert _get_some_data('herp') == 'derp'
-
-    # now we force-change it, but the function should use the cached
-    # version
-    some_data_cache.put('herp', 'pred')
-    assert _get_some_data('herp') == 'pred'

diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index cc4a7addf66c8c10c6b3aeb67a89703aae882002..1d8e6e9665830b845dbe6ae46b20a55ebf026938 100644 (file)
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -45,9 +45,7 @@ TEST_USER_DEV = pkg_resources.resource_filename(
     'mediagoblin.tests', 'test_user_dev')
 MGOBLIN_APP = None
 
-USER_DEV_DIRECTORIES_TO_SETUP = [
-    'media/public', 'media/queue',
-    'beaker/sessions/data', 'beaker/sessions/lock']
+USER_DEV_DIRECTORIES_TO_SETUP = ['media/public', 'media/queue']
 
 BAD_CELERY_MESSAGE = """\
 Sorry, you *absolutely* must run nosetests with the

diff --git a/paste.ini b/paste.ini
index 103bb60959fbae2ad0a48332fd9bad6fdd8cbab1..1f0ee1b580667b93269a84c2f9b6d70822ab8ce3 100644 (file)
--- a/paste.ini
+++ b/paste.ini
@@ -17,7 +17,7 @@ use = egg:Paste#urlmap
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
-filter-with = beaker
+# filter-with = beaker
 config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
 
 [loggers]

diff --git a/setup.py b/setup.py
index 3593604e1bdebf52be12649fa1775d290a3efe05..1aebeb0fa4548e938d78b51b2a0cb7f5e2139fb1 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,6 @@ setup(
     install_requires=[
         'setuptools',
         'PasteScript',
-        'beaker',
         'wtforms',
         'py-bcrypt',
         'nose',