From 9149902c7817703696a998a00f138c2c2bc520bc Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 7 Jul 2018 20:43:17 -0500 Subject: [PATCH] Remove deprecated "edbob" settings --- tailbone/app.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/tailbone/app.py b/tailbone/app.py index 60808cc9..128a70a2 100644 --- a/tailbone/app.py +++ b/tailbone/app.py @@ -55,13 +55,8 @@ def make_rattail_config(settings): # available for web requests later path = settings.get('rattail.config') if not path or not os.path.exists(path): - path = settings.get('edbob.config') - if not path or not os.path.exists(path): - raise ConfigurationError("Please set 'rattail.config' in [app:main] section of config " - "to the path of your config file. Lame, but necessary.") - warnings.warn("[app:main] setting 'edbob.config' is deprecated; " - "please use 'rattail.config' setting instead", - DeprecationWarning) + raise ConfigurationError("Please set 'rattail.config' in [app:main] section of config " + "to the path of your config file. Lame, but necessary.") rattail_config = make_config(path) settings['rattail_config'] = rattail_config rattail_config.configure_logging() @@ -146,14 +141,6 @@ def make_pyramid_config(settings, configure_csrf=True): config.add_directive('add_tailbone_permission_group', 'tailbone.auth.add_permission_group') config.add_directive('add_tailbone_permission', 'tailbone.auth.add_permission') - # TODO: This can finally be removed once all CRUD/index views have been - # converted to use the new master view etc. - for label, perms in settings.get('edbob.permissions', []): - groupkey = label.lower().replace(' ', '_') - config.add_tailbone_permission_group(groupkey, label) - for key, label in perms: - config.add_tailbone_permission(groupkey, key, label) - return config