diff --git a/IPython/config/default/ipython_config.py b/IPython/config/default/ipython_config.py index e4130fe..cd99a51 100644 --- a/IPython/config/default/ipython_config.py +++ b/IPython/config/default/ipython_config.py @@ -11,6 +11,10 @@ c = get_config() # c.Global.nosep = True +# If you still use multiple versions of IPytho on the same machine, +# set this to True to suppress warnings about old configuration files +# c.Global.ignore_old_config = False + # Set this to determine the detail of what is logged at startup. # The default is 30 and possible values are 0,10,20,30,40,50. # c.Global.log_level = 20 diff --git a/IPython/frontend/terminal/ipapp.py b/IPython/frontend/terminal/ipapp.py index 472b58e..c667181 100755 --- a/IPython/frontend/terminal/ipapp.py +++ b/IPython/frontend/terminal/ipapp.py @@ -635,7 +635,8 @@ class IPythonApp(Application): self.shell.showtraceback() def start_app(self): - check_for_old_config(self.ipython_dir) + if not getattr(self.master_config.Global, 'ignore_old_config', False): + check_for_old_config(self.ipython_dir) if self.master_config.Global.interact: self.log.debug("Starting IPython's mainloop...") self.shell.mainloop() diff --git a/IPython/utils/path.py b/IPython/utils/path.py index c046e8c..5b6bb6d 100644 --- a/IPython/utils/path.py +++ b/IPython/utils/path.py @@ -418,4 +418,6 @@ def check_for_old_config(ipython_dir=None): warn.warn("""Found old IPython config file %r. The IPython configuration system has changed as of 0.11, and this file will be ignored. See http://ipython.github.com/ipython-doc/dev/config for details on the new config system. - The current default config file is 'ipython_config.py'"""%f) + The current default config file is 'ipython_config.py', where you can suppress these + warnings with `Global.ignore_old_config = True`."""%f) +