From b9b993fe4a749c20caf7b05baff5cbc491eebac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 30 Aug 2016 13:53:30 +0200 Subject: [PATCH] Extension system: allow empty Eve settings. Extensions are now able to return an empty dict from their eve_settings() method. --- pillar/__init__.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pillar/__init__.py b/pillar/__init__.py index c13b916d..fdabe5cf 100644 --- a/pillar/__init__.py +++ b/pillar/__init__.py @@ -192,14 +192,15 @@ class PillarServer(Eve): # Load extension Eve settings eve_settings = pillar_extension.eve_settings() - for key, collection in eve_settings['DOMAIN'].items(): - source = '%s.%s' % (pillar_extension.name, key) - url = '%s/%s' % (pillar_extension.name, key) + if 'DOMAIN' in eve_settings: + for key, collection in eve_settings['DOMAIN'].items(): + source = '%s.%s' % (pillar_extension.name, key) + url = '%s/%s' % (pillar_extension.name, key) - collection.setdefault('datasource', {}).setdefault('source', source) - collection.setdefault('url', url) + collection.setdefault('datasource', {}).setdefault('source', source) + collection.setdefault('url', url) - self.config['DOMAIN'].update(eve_settings['DOMAIN']) + self.config['DOMAIN'].update(eve_settings['DOMAIN']) def _config_jinja_env(self): pillar_dir = os.path.dirname(os.path.realpath(__file__))