[Update] 修改配置文件加载

pull/2357/head
ibuler 2019-01-17 20:38:56 +08:00
parent d664018bd7
commit d8069f47f2
2 changed files with 4 additions and 5 deletions

View File

@ -193,8 +193,8 @@ class Config(dict):
if self.root_path:
filename = os.path.join(self.root_path, filename)
try:
with open(filename) as json_file:
obj = yaml.load(json_file)
with open(filename) as f:
obj = yaml.load(f)
except IOError as e:
if silent and e.errno in (errno.ENOENT, errno.EISDIR):
return False
@ -202,8 +202,7 @@ class Config(dict):
raise
if obj:
return self.from_mapping(obj)
else:
return False
return True
def from_mapping(self, *mapping, **kwargs):
"""Updates the config like :meth:`update` ignoring items with non-upper

2
jms
View File

@ -18,7 +18,7 @@ try:
from apps.jumpserver.conf import load_user_config
CONFIG = load_user_config()
except ImportError:
print("Could not find config file, `cp config_example.py config.py`")
print("Could not find config file, `cp config_example.yml config.yml`")
sys.exit(1)
os.environ["PYTHONIOENCODING"] = "UTF-8"