From 0aa0be7060c2b1f13858abd4287b89c182aa7fb0 2011-08-01 17:13:30
From: MinRK <benjaminrk@gmail.com>
Date: 2011-08-01 17:13:30
Subject: [PATCH] don't crash on bad config files

---

diff --git a/IPython/config/application.py b/IPython/config/application.py
index ebf773b..953e27e 100644
--- a/IPython/config/application.py
+++ b/IPython/config/application.py
@@ -366,8 +366,13 @@ class Application(SingletonConfigurable):
     def load_config_file(self, filename, path=None):
         """Load a .py based config file by filename and path."""
         loader = PyFileConfigLoader(filename, path=path)
-        config = loader.load_config()
-        self.update_config(config)
+        try:
+            config = loader.load_config()
+        except Exception:
+            self.log.error("Exception while loading config file %s [path=%s]"%
+                            (filename, path), exc_info=True)
+        else:
+            self.update_config(config)
     
     def generate_config_file(self):
         """generate default config file from Configurables"""