From 47a3fd47b5b2a4fdc10275f6f8442cb07feb355b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Tue, 20 Nov 2018 18:18:33 +0200 Subject: [PATCH] Fix DB_FLAVOR condition testing for models.py --- core/admin/mailu/configuration.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index 04d545c8..65fd3907 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -66,16 +66,20 @@ class ConfigManager(dict): def __init__(self): self.config = dict() + self.parse_env() def init_app(self, app): self.config.update(app.config) + self.parse_env() + if self.config['DB_FLAVOR'] != 'sqlite': + self.setsql() + app.config = self + + def parse_env(self): self.config.update({ key: os.environ.get(key, value) for key, value in DEFAULT_CONFIG.items() }) - if self.config['DB_FLAVOR'] != 'sqlite': - self.setsql() - app.config = self def setsql(self): if not self.config['DB_PW']: