Skip to content

Commit

Permalink
Merge pull request #24 from Carreau/log
Browse files Browse the repository at this point in the history
move login from jupyter_core
  • Loading branch information
takluyver committed Jun 3, 2015
2 parents ca01cd3 + a4af1b1 commit 45ceb1d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions traitlets/config/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,9 @@ def _load_config_files(cls, basefilename, path=None, log=None):
for path in path[::-1]:
# path list is in descending priority order, so load files backwards:
pyloader = cls.python_config_loader_class(basefilename+'.py', path=path, log=log)
log.debug("Attempting to load config file %s.py in path %s", basefilename, path)
jsonloader = cls.json_config_loader_class(basefilename+'.json', path=path, log=log)
log.debug("Attempting to load config file %s.json in path %s", basefilename, path)
config = None
for loader in [pyloader, jsonloader]:
try:
Expand Down

0 comments on commit 45ceb1d

Please sign in to comment.