Merge pull request #25 from Carreau/log-2

log can be Nonetype
ipython · Jun 3, 2015 · f6f5946 · f6f5946
2 parents 45ceb1d + 72645a1
commit f6f5946
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/traitlets/config/application.py b/traitlets/config/application.py
@@ -524,9 +524,11 @@ 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)
+            if 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)
+            if log:
+                log.debug("Attempting to load config file %s.json in path %s", basefilename, path)
             config = None
             for loader in [pyloader, jsonloader]:
                 try: