merge
This commit is contained in:
commit
052af650e9
@ -20,13 +20,14 @@ default_config = {
|
||||
'pypath': None,
|
||||
}
|
||||
|
||||
with open(os.path.expanduser('~/.config/interp.json')) as config_file:
|
||||
d = json.load(config_file)
|
||||
try:
|
||||
with open(os.path.expanduser('~/.config/interp.json')) as config_file:
|
||||
d = json.load(config_file)
|
||||
except IOError as e:
|
||||
d = {}
|
||||
|
||||
config = dict(default_config.items() + d.items())
|
||||
|
||||
print config
|
||||
|
||||
logger = logging.getLogger('interp')
|
||||
logger.setLevel(LEVELS[config['level']])
|
||||
my_format = logging.Formatter('%(asctime)s %(levelname)s (%(process)d) %(filename)s %(funcName)s:%(lineno)d %(message)s')
|
||||
|
Loading…
Reference in New Issue
Block a user