From c03e6aa132ddd6211202b5a0c1d78d3b12637890 2014-01-14 00:05:55
From: Paul Ivanov <pi@berkeley.edu>
Date: 2014-01-14 00:05:55
Subject: [PATCH] fix a NameError inside an exception

---

diff --git a/IPython/config/application.py b/IPython/config/application.py
index 0d1abd7..9014dd8 100644
--- a/IPython/config/application.py
+++ b/IPython/config/application.py
@@ -505,7 +505,6 @@ class Application(SingletonConfigurable):
 
         yield each config object in turn.
         """
-
         pyloader = PyFileConfigLoader(basefilename+'.py', path=path, log=log)
         jsonloader = JSONFileConfigLoader(basefilename+'.json', path=path, log=log)
         config_found = False
@@ -519,7 +518,7 @@ class Application(SingletonConfigurable):
             except Exception:
                 # try to get the full filename, but it will be empty in the
                 # unlikely event that the error raised before filefind finished
-                filename = loader.full_filename or filename
+                filename = loader.full_filename or basefilename
                 # problem while running the file
                 if log:
                     log.error("Exception while loading config file %s",