catch_config -> catch_config_error

IPython/config/application.py

@@ -72,7 +72,7 b" subcommand 'cmd', do: `{app} cmd -h`."
 #-----------------------------------------------------------------------------
 
 @decorator
-def catch_config(method, app, *args, **kwargs):
+def catch_config_error(method, app, *args, **kwargs):
     """Method decorator for catching invalid config (Trait/ArgumentErrors) during init.
 
     On a TraitError (generally caused by bad config), this will print the trait's
@@ -195,7 +195,7 b' class Application(SingletonConfigurable):'
         self._log_handler.setFormatter(self._log_formatter)
         self.log.addHandler(self._log_handler)
 
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         """Do the basic steps to configure me.
 
@@ -340,7 +340,7 b' class Application(SingletonConfigurable):'
         # events.
         self.config = newconfig
 
-    @catch_config
+    @catch_config_error
     def initialize_subcommand(self, subc, argv=None):
         """Initialize a subcommand with argv."""
         subapp,help = self.subcommands.get(subc)
@@ -400,7 +400,7 b' class Application(SingletonConfigurable):'
             flags[key] = (newflag, help)
         return flags, aliases
 
-    @catch_config
+    @catch_config_error
     def parse_command_line(self, argv=None):
         """Parse the command line arguments."""
         argv = sys.argv[1:] if argv is None else argv
@@ -432,7 +432,7 b' class Application(SingletonConfigurable):'
         # store unparsed args in extra_args
         self.extra_args = loader.extra_args
 
-    @catch_config
+    @catch_config_error
     def load_config_file(self, filename, path=None):
         """Load a .py based config file by filename and path."""
         loader = PyFileConfigLoader(filename, path=path)

IPython/core/application.py

@@ -34,7 +34,7 b' import os'
 import shutil
 import sys
 
-from IPython.config.application import Application, catch_config
+from IPython.config.application import Application, catch_config_error
 from IPython.config.configurable import Configurable
 from IPython.config.loader import Config, ConfigFileNotFound
 from IPython.core import release, crashhandler
@@ -304,7 +304,7 b' class BaseIPythonApplication(Application):'
             with open(fname, 'w') as f:
                 f.write(s)
 
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         # don't hook up crash handler before parsing command-line
         self.parse_command_line(argv)

IPython/frontend/html/notebook/notebookapp.py

@@ -43,7 +43,7 b' from .handlers import (LoginHandler,'
 )
 from .notebookmanager import NotebookManager
 
-from IPython.config.application import catch_config
+from IPython.config.application import catch_config_error
 from IPython.core.application import BaseIPythonApplication
 from IPython.core.profiledir import ProfileDir
 from IPython.zmq.session import Session, default_secure
@@ -261,7 +261,7 b' class NotebookApp(BaseIPythonApplication):'
         # and all of its ancenstors until propagate is set to False.
         self.log.propagate = False
 
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         super(NotebookApp, self).initialize(argv)
         self.init_configurables()

IPython/frontend/qt/console/qtconsoleapp.py

@@ -29,7 +29,7 b' import uuid'
 from IPython.external.qt import QtGui
 
 # Local imports
-from IPython.config.application import boolean_flag, catch_config
+from IPython.config.application import boolean_flag, catch_config_error
 from IPython.core.application import BaseIPythonApplication
 from IPython.core.profiledir import ProfileDir
 from IPython.lib.kernel import tunnel_to_kernel, find_connection_file
@@ -516,7 +516,7 b' class IPythonQtConsoleApp(BaseIPythonApplication):'
             else:
                 raise IOError("Stylesheet %r not found."%self.stylesheet)
 
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         super(IPythonQtConsoleApp, self).initialize(argv)
         self.init_connection_file()

IPython/frontend/terminal/ipapp.py

@@ -32,7 +32,7 b' import sys'
 from IPython.config.loader import (
     Config, PyFileConfigLoader, ConfigFileNotFound
 )
-from IPython.config.application import boolean_flag, catch_config
+from IPython.config.application import boolean_flag, catch_config_error
 from IPython.core import release
 from IPython.core import usage
 from IPython.core.completer import Completer
@@ -286,7 +286,7 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
 
         return super(TerminalIPythonApp, self).parse_command_line(argv)
     
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         """Do actions after construct, but before starting the app."""
         super(TerminalIPythonApp, self).initialize(argv)

IPython/parallel/apps/baseapp.py

@@ -29,7 +29,7 b' import sys'
 
 from subprocess import Popen, PIPE
 
-from IPython.config.application import catch_config
+from IPython.config.application import catch_config_error
 from IPython.core import release
 from IPython.core.crashhandler import CrashHandler
 from IPython.core.application import (
@@ -145,7 +145,7 b' class BaseParallelApplication(BaseIPythonApplication):'
     aliases = Dict(base_aliases)
     flags = Dict(base_flags)
     
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         """initialize the app"""
         super(BaseParallelApplication, self).initialize(argv)

IPython/parallel/apps/ipclusterapp.py

@@ -31,7 +31,7 b' from subprocess import check_call, CalledProcessError, PIPE'
 import zmq
 from zmq.eventloop import ioloop
 
-from IPython.config.application import Application, boolean_flag, catch_config
+from IPython.config.application import Application, boolean_flag, catch_config_error
 from IPython.config.loader import Config
 from IPython.core.application import BaseIPythonApplication
 from IPython.core.profiledir import ProfileDir
@@ -269,7 +269,7 b' class IPClusterEngines(BaseParallelApplication):'
     flags = Dict(engine_flags)
     _stopping = False
 
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         super(IPClusterEngines, self).initialize(argv)
         self.init_signal()

IPython/parallel/apps/ipcontrollerapp.py

@@ -41,7 +41,7 b' from IPython.parallel.apps.baseapp import ('
     BaseParallelApplication,
     base_aliases,
     base_flags,
-    catch_config,
+    catch_config_error,
 )
 from IPython.utils.importstring import import_item
 from IPython.utils.traitlets import Instance, Unicode, Bool, List, Dict, TraitError
@@ -388,7 +388,7 b' class IPControllerApp(BaseParallelApplication):'
             self.log.addHandler(handler)
             self._log_handler = handler
     
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         super(IPControllerApp, self).initialize(argv)
         self.forward_logging()

IPython/parallel/apps/ipengineapp.py

@@ -34,7 +34,7 b' from IPython.parallel.apps.baseapp import ('
     BaseParallelApplication,
     base_aliases,
     base_flags,
-    catch_config,
+    catch_config_error,
 )
 from IPython.zmq.log import EnginePUBHandler
 from IPython.zmq.session import (
@@ -319,7 +319,7 b' class IPEngineApp(BaseParallelApplication):'
         else:
             mpi = None
 
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         super(IPEngineApp, self).initialize(argv)
         self.init_mpi()

IPython/parallel/apps/iploggerapp.py

@@ -31,7 +31,7 b' from IPython.utils.traitlets import Bool, Dict, Unicode'
 from IPython.parallel.apps.baseapp import (
     BaseParallelApplication,
     base_aliases,
-    catch_config,
+    catch_config_error,
 )
 from IPython.parallel.apps.logwatcher import LogWatcher
 
@@ -69,7 +69,7 b' class IPLoggerApp(BaseParallelApplication):'
     classes = [LogWatcher, ProfileDir]
     aliases = Dict(aliases)
 
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         super(IPLoggerApp, self).initialize(argv)
         self.init_watcher()

IPython/zmq/ipkernel.py

@@ -28,7 +28,7 b' import zmq'
 
 # Local imports.
 from IPython.config.configurable import Configurable
-from IPython.config.application import boolean_flag, catch_config
+from IPython.config.application import boolean_flag, catch_config_error
 from IPython.core.application import ProfileDir
 from IPython.core.error import StdinNotImplementedError
 from IPython.core.shellapp import (
@@ -731,7 +731,7 b' class IPKernelApp(KernelApp, InteractiveShellApp):'
         """
     )
     
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         super(IPKernelApp, self).initialize(argv)
         self.init_shell()

IPython/zmq/kernelapp.py

@@ -26,7 +26,7 b' import zmq'
 # IPython imports.
 from IPython.core.ultratb import FormattedTB
 from IPython.core.application import (
-    BaseIPythonApplication, base_flags, base_aliases, catch_config
+    BaseIPythonApplication, base_flags, base_aliases, catch_config_error
 )
 from IPython.utils import io
 from IPython.utils.localinterfaces import LOCALHOST
@@ -275,7 +275,7 b' class KernelApp(BaseIPythonApplication):'
         )
         self.kernel.record_ports(self.ports)
 
-    @catch_config
+    @catch_config_error
     def initialize(self, argv=None):
         super(KernelApp, self).initialize(argv)
         self.init_blackhole()