From d664018bd70f00e30fb0a79ec0e7ab75ecbe2c94 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 17 Jan 2019 20:32:10 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9config.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/conf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index c940337da..c0d94ee69 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -200,7 +200,10 @@ class Config(dict): return False e.strerror = 'Unable to load configuration file (%s)' % e.strerror raise - return self.from_mapping(obj) + if obj: + return self.from_mapping(obj) + else: + return False def from_mapping(self, *mapping, **kwargs): """Updates the config like :meth:`update` ignoring items with non-upper