Permalink
Browse files

cp

  • Loading branch information...
minrk committed Oct 9, 2011
1 parent 200a760 commit 0ea97a2df8d71820720b66a21616de6f964e22a7
Showing with 5 additions and 5 deletions.
  1. +3 −3 IPython/core/application.py
  2. +2 −2 IPython/frontend/terminal/ipapp.py
@@ -35,7 +35,7 @@
from IPython.config.application import Application
from IPython.config.configurable import Configurable
-from IPython.config.loader import Config
+from IPython.config.loader import Config, ConfigFileNotFound
from IPython.core import release, crashhandler
from IPython.core.profiledir import ProfileDir, ProfileDirError
from IPython.utils.path import get_ipython_dir, get_ipython_package_dir
@@ -186,7 +186,7 @@ def load_config_file(self, suppress_errors=True):
base_config,
path=self.config_file_paths
)
- except IOError:
+ except ConfigFileNotFound:
# ignore errors loading parent
self.log.debug("Config file %s not found", base_config)
pass
@@ -201,7 +201,7 @@ def load_config_file(self, suppress_errors=True):
self.config_file_name,
path=self.config_file_paths
)
- except IOError:
+ except ConfigFileNotFound:
# Only warn if the default config file was NOT being used.
if self.config_file_specified:
msg = self.log.warn
@@ -30,7 +30,7 @@
import sys
from IPython.config.loader import (
- Config, PyFileConfigLoader
+ Config, PyFileConfigLoader, ConfigFileNotFound
)
from IPython.config.application import boolean_flag
from IPython.core import release
@@ -378,7 +378,7 @@ def load_default_config(ipython_dir=None):
cl = PyFileConfigLoader(default_config_file_name, profile_dir)
try:
config = cl.load_config()
- except IOError:
+ except ConfigFileNotFound:
# no config found
config = Config()
return config

0 comments on commit 0ea97a2

Please sign in to comment.