archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Extension system: allow empty Eve settings.

Browse Source 
Extensions are now able to return an empty dict from their eve_settings()
method.
This commit is contained in:
Sybren A. Stüvel 2016-08-30 13:53:30 +02:00
parent 2c62bd4016
commit b9b993fe4a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pillar/__init__.py
View File

@ -192,14 +192,15 @@ class PillarServer(Eve):
# Load extension Eve settings # Load extension Eve settings
eve_settings = pillar_extension.eve_settings() eve_settings = pillar_extension.eve_settings()
for key, collection in eve_settings['DOMAIN'].items(): if 'DOMAIN' in eve_settings:
source = '%s.%s' % (pillar_extension.name, key) for key, collection in eve_settings['DOMAIN'].items():
url = '%s/%s' % (pillar_extension.name, key) source = '%s.%s' % (pillar_extension.name, key)
url = '%s/%s' % (pillar_extension.name, key)
collection.setdefault('datasource', {}).setdefault('source', source) collection.setdefault('datasource', {}).setdefault('source', source)
collection.setdefault('url', url) collection.setdefault('url', url)
self.config['DOMAIN'].update(eve_settings['DOMAIN']) self.config['DOMAIN'].update(eve_settings['DOMAIN'])
def _config_jinja_env(self): def _config_jinja_env(self):
pillar_dir = os.path.dirname(os.path.realpath(__file__)) pillar_dir = os.path.dirname(os.path.realpath(__file__))