prenex/magcms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fix] yaml.safe_load except a FD

Browse Source
This commit is contained in:
Laurent Peuch 2015-12-08 07:36:17 +01:00
parent 375af3c4d2
commit 3bc95c0a85
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prosopopoee
View File

@ -17,7 +17,7 @@ def error(test, error_message):
def main(): def main():
error(os.path.exists(os.path.join(os.getcwd(), "settings.yaml")), "I can't find a settings.yaml in the current working directory, abort") error(os.path.exists(os.path.join(os.getcwd(), "settings.yaml")), "I can't find a settings.yaml in the current working directory, abort")
settings = yaml.safe_load("settings.yaml") settings = yaml.safe_load(open("settings.yaml", "r"))
error(isinstance(settings, dict), "Your settings.yaml should be a dict") error(isinstance(settings, dict), "Your settings.yaml should be a dict")
error(settings.get("title"), "You should specify a title in your main settings.yaml") error(settings.get("title"), "You should specify a title in your main settings.yaml")
@ -31,7 +31,7 @@ def main():
error(dirs, "I can't find at least one directory with a settings.yaml in the current working directory, you don't have any gallery?\nAbort") error(dirs, "I can't find at least one directory with a settings.yaml in the current working directory, you don't have any gallery?\nAbort")
for gallery in dirs: for gallery in dirs:
gallery_settings = yaml.safe_load(os.path.join(os.getcwd(), gallery, "settings.yaml")) gallery_settings = yaml.safe_load(open(os.path.join(os.getcwd(), gallery, "settings.yaml")), "r")
error(isinstance(gallery_settings, dict), "Your settings.yaml should be a dict") error(isinstance(gallery_settings, dict), "Your settings.yaml should be a dict")
error(gallery_settings.get("title"), "You should specify a title in %s" % (os.path.join(gallery, "settings.yaml"))) error(gallery_settings.get("title"), "You should specify a title in %s" % (os.path.join(gallery, "settings.yaml")))