psi-jack/dotbot
1
0
Fork 0
mirror of synced 2024-12-22 06:01:07 -05:00
Code Issues Releases Wiki Activity

Use file extension to select config file parser

Browse source 
This patch makes Dotbot provide better error messages when parsing JSON
files.
This commit is contained in:
Anish Athalye 2016-01-13 13:46:41 -05:00
parent c48d16cbce
commit 47ad7f4d3b
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dotbot/config.py
View file

@ -1,5 +1,6 @@
import yaml import yaml
import json import json
import os.path
from .util import string from .util import string
class ConfigReader(object): class ConfigReader(object):
@ -8,17 +9,13 @@ class ConfigReader(object):
def _read(self, config_file_path): def _read(self, config_file_path):
try: try:
_, ext = os.path.splitext(config_file_path)
with open(config_file_path) as fin: with open(config_file_path) as fin:
try: print ext
if ext == '.json':
data = json.load(fin)
else:
data = yaml.safe_load(fin) data = yaml.safe_load(fin)
except Exception as e:
# try falling back to JSON, but return original exception
# if that fails too
try:
fin.seek(0)
data = json.load(fin)
except Exception:
raise e
return data return data
except Exception as e: except Exception as e:
msg = string.indent_lines(str(e)) msg = string.indent_lines(str(e))