Remove the last traces of beaker.

There were still some traces of beaker around:
- docs: replaced by reference to itsdangerous.
- paste configs: Wiped away.
- config_spec.ini: wiped.
- test_mgoblin_app.ini: also wiped.

diff --git a/docs/source/devel/codebase.rst b/docs/source/devel/codebase.rst
index cd46242ccbea4f7a4c6c671abfdf5956ec8968f6..9718a097494890aa579973bf281b5700c02ebdb5 100644 (file)
--- a/docs/source/devel/codebase.rst
+++ b/docs/source/devel/codebase.rst
@@ -142,8 +142,8 @@ Software Stack
   * `werkzeug <http://werkzeug.pocoo.org/>`_: nice abstraction layer
     from HTTP requests, responses and WSGI bits
 
-  * `Beaker <http://beaker.groovie.org/>`_: for handling sessions and
-    caching
+  * `itsdangerous <http://pythonhosted.org/itsdangerous/>`_:
+    for handling sessions
 
   * `Jinja2 <http://jinja.pocoo.org/docs/>`_: the templating engine
 

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 8c9c87c819d5d4ea4597a9193372478c0718fce5..e830e8631ecea16a2f96e84a2a692ba9e0893b49 100644 (file)
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -125,11 +125,6 @@ spectrogram_fft_size = integer(default=4096)
 [media_type:mediagoblin.media_types.ascii]
 thumbnail_font = string(default=None)
 
-[beaker.cache]
-type = string(default="file")
-data_dir = string(default="%(here)s/user_dev/beaker/cache/data")
-lock_dir = string(default="%(here)s/user_dev/beaker/cache/lock")
-
 
 [celery]
 # default result stuff

diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini
index 42d3785a8921b18e633100fb9dcdb230b64b9a34..b78abe64fd7a811e74b64e0ca060b0927cbc57d9 100644 (file)
--- a/mediagoblin/tests/test_mgoblin_app.ini
+++ b/mediagoblin/tests/test_mgoblin_app.ini
@@ -23,10 +23,6 @@ base_url = /mgoblin_media/
 [storage:queuestore]
 base_dir = %(here)s/test_user_dev/media/queue
 
-[beaker.cache]
-data_dir = %(here)s/test_user_dev/beaker/cache/data
-lock_dir = %(here)s/test_user_dev/beaker/cache/lock
-
 [celery]
 CELERY_ALWAYS_EAGER = true
 CELERY_RESULT_DBURI = "sqlite:///%(here)s/test_user_dev/celery.db"

diff --git a/mediagoblin/tests/test_paste.ini b/mediagoblin/tests/test_paste.ini
index 875b4f653a4e6bdae53d9e43c067e2ecf99a29b3..91ecbb843193101ae455cd503bd9b798b74ad4c5 100644 (file)
--- a/mediagoblin/tests/test_paste.ini
+++ b/mediagoblin/tests/test_paste.ini
@@ -9,7 +9,6 @@ use = egg:Paste#urlmap
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
-filter-with = beaker
 config = %(here)s/mediagoblin.ini
 
 [app:publicstore_serve]
@@ -20,14 +19,6 @@ document_root = %(here)s/test_user_dev/media/public
 use = egg:Paste#static
 document_root = %(here)s/mediagoblin/static/
 
-[filter:beaker]
-use = egg:Beaker#beaker_session
-cache_dir = %(here)s/test_user_dev/beaker
-beaker.session.key = mediagoblin
-# beaker.session.secret = somesupersecret
-beaker.session.data_dir = %(here)s/test_user_dev/beaker/sessions/data
-beaker.session.lock_dir = %(here)s/test_user_dev/beaker/sessions/lock
-
 [celery]
 CELERY_ALWAYS_EAGER = true
 

diff --git a/paste.ini b/paste.ini
index 1f0ee1b580667b93269a84c2f9b6d70822ab8ce3..4c6397fad793336b02f6327ea713b8ddd247bb8d 100644 (file)
--- a/paste.ini
+++ b/paste.ini
@@ -17,7 +17,6 @@ use = egg:Paste#urlmap
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
-# filter-with = beaker
 config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
 
 [loggers]
@@ -57,14 +56,6 @@ use = egg:Paste#static
 document_root = %(here)s/user_dev/theme_static/
 cache_max_age = 86400
 
-[filter:beaker]
-use = egg:Beaker#beaker_session
-cache_dir = %(here)s/user_dev/beaker
-beaker.session.key = mediagoblin
-# beaker.session.secret = somesupersecret
-beaker.session.data_dir = %(here)s/user_dev/beaker/sessions/data
-beaker.session.lock_dir = %(here)s/user_dev/beaker/sessions/lock
-
 [filter:errors]
 use = egg:mediagoblin#errors
 debug = false