rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove deprecated "edbob" settings

Browse source
This commit is contained in:
Lance Edgar 2018-07-07 20:43:17 -05:00
parent b464db5722
commit 9149902c78
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tailbone/app.py
View file

@ -54,14 +54,9 @@ def make_rattail_config(settings):
# initialize rattail config and embed in settings dict, to make # initialize rattail config and embed in settings dict, to make
# available for web requests later # available for web requests later
path = settings.get('rattail.config') 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): if not path or not os.path.exists(path):
raise ConfigurationError("Please set 'rattail.config' in [app:main] section of config " raise ConfigurationError("Please set 'rattail.config' in [app:main] section of config "
"to the path of your config file. Lame, but necessary.") "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)
rattail_config = make_config(path) rattail_config = make_config(path)
settings['rattail_config'] = rattail_config settings['rattail_config'] = rattail_config
rattail_config.configure_logging() 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_group', 'tailbone.auth.add_permission_group')
config.add_directive('add_tailbone_permission', 'tailbone.auth.add_permission') 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 return config