From 82a40cc4e145e4fdf5f81d7b6319cf713afa44c1 Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 9 Apr 2013 22:39:04 +0200 Subject: [PATCH] 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. --- docs/source/devel/codebase.rst | 4 ++-- mediagoblin/config_spec.ini | 5 ----- mediagoblin/tests/test_mgoblin_app.ini | 4 ---- mediagoblin/tests/test_paste.ini | 9 --------- paste.ini | 9 --------- 5 files changed, 2 insertions(+), 29 deletions(-) diff --git a/docs/source/devel/codebase.rst b/docs/source/devel/codebase.rst index cd46242c..9718a097 100644 --- a/docs/source/devel/codebase.rst +++ b/docs/source/devel/codebase.rst @@ -142,8 +142,8 @@ Software Stack * `werkzeug `_: nice abstraction layer from HTTP requests, responses and WSGI bits - * `Beaker `_: for handling sessions and - caching + * `itsdangerous `_: + for handling sessions * `Jinja2 `_: the templating engine diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 8c9c87c8..e830e863 100644 --- 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 42d3785a..b78abe64 100644 --- 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 875b4f65..91ecbb84 100644 --- 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 1f0ee1b5..4c6397fa 100644 --- 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 -- 2.25.1