From dc28dd995a9e81cbeb8617329f21c667e57686fa Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 11 Jun 2021 17:41:15 -0500 Subject: [PATCH] Do not set config defaults, if config says not to so that we can include corporal as dependency to other projects without the config interference --- corporal/config.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/corporal/config.py b/corporal/config.py index 92e0e36..e8d4a17 100644 --- a/corporal/config.py +++ b/corporal/config.py @@ -13,12 +13,15 @@ class CorporalConfig(ConfigExtension): def configure(self, config): - # set some default config values - config.setdefault('rattail', 'model', 'corporal.db.model') - config.setdefault('rattail.mail', 'emails', 'corporal.emails') - config.setdefault('rattail', 'settings', 'corporal.settings') - config.setdefault('tailbone', 'menus', 'corporal.web.menus') - config.setdefault('rattail.config', 'templates', 'corporal:data/config rattail:data/config') + if config.getbool('rattail.config', 'corporal.set_defaults', + usedb=False, default=True): - # batches - config.setdefault('rattail.batch', 'vendor_catalog.handler', 'corporal.batch.vendorcatalog:VendorCatalogHandler') + # set some default config values + config.setdefault('rattail', 'model', 'corporal.db.model') + config.setdefault('rattail.mail', 'emails', 'corporal.emails') + config.setdefault('rattail', 'settings', 'corporal.settings') + config.setdefault('tailbone', 'menus', 'corporal.web.menus') + config.setdefault('rattail.config', 'templates', 'corporal:data/config rattail:data/config') + + # batches + config.setdefault('rattail.batch', 'vendor_catalog.handler', 'corporal.batch.vendorcatalog:VendorCatalogHandler')