From d05b9909821625a06e5145fec39a1619d765f6f4 2011-10-28 22:22:24 From: MinRK Date: 2011-10-28 22:22:24 Subject: [PATCH] catch_config -> catch_config_error --- diff --git a/IPython/config/application.py b/IPython/config/application.py index 12abace..5341e22 100644 --- a/IPython/config/application.py +++ b/IPython/config/application.py @@ -72,7 +72,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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) diff --git a/IPython/core/application.py b/IPython/core/application.py index 24ee385..2399985 100644 --- a/IPython/core/application.py +++ b/IPython/core/application.py @@ -34,7 +34,7 @@ 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 @@ 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) diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py index 24f275d..cf259a1 100644 --- a/IPython/frontend/html/notebook/notebookapp.py +++ b/IPython/frontend/html/notebook/notebookapp.py @@ -43,7 +43,7 @@ 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 @@ 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() diff --git a/IPython/frontend/qt/console/qtconsoleapp.py b/IPython/frontend/qt/console/qtconsoleapp.py index 9783696..43a048f 100644 --- a/IPython/frontend/qt/console/qtconsoleapp.py +++ b/IPython/frontend/qt/console/qtconsoleapp.py @@ -29,7 +29,7 @@ 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 @@ 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() diff --git a/IPython/frontend/terminal/ipapp.py b/IPython/frontend/terminal/ipapp.py index f467198..d42b240 100755 --- a/IPython/frontend/terminal/ipapp.py +++ b/IPython/frontend/terminal/ipapp.py @@ -32,7 +32,7 @@ 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 @@ 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) diff --git a/IPython/parallel/apps/baseapp.py b/IPython/parallel/apps/baseapp.py index 18eb28d..63bdec2 100644 --- a/IPython/parallel/apps/baseapp.py +++ b/IPython/parallel/apps/baseapp.py @@ -29,7 +29,7 @@ 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 @@ 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) diff --git a/IPython/parallel/apps/ipclusterapp.py b/IPython/parallel/apps/ipclusterapp.py index ac0e729..1d70e2b 100755 --- a/IPython/parallel/apps/ipclusterapp.py +++ b/IPython/parallel/apps/ipclusterapp.py @@ -31,7 +31,7 @@ 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 @@ 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() diff --git a/IPython/parallel/apps/ipcontrollerapp.py b/IPython/parallel/apps/ipcontrollerapp.py index 339feaa..362fe71 100755 --- a/IPython/parallel/apps/ipcontrollerapp.py +++ b/IPython/parallel/apps/ipcontrollerapp.py @@ -41,7 +41,7 @@ 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 @@ 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() diff --git a/IPython/parallel/apps/ipengineapp.py b/IPython/parallel/apps/ipengineapp.py index 647eb1c..f8530cc 100755 --- a/IPython/parallel/apps/ipengineapp.py +++ b/IPython/parallel/apps/ipengineapp.py @@ -34,7 +34,7 @@ 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 @@ class IPEngineApp(BaseParallelApplication): else: mpi = None - @catch_config + @catch_config_error def initialize(self, argv=None): super(IPEngineApp, self).initialize(argv) self.init_mpi() diff --git a/IPython/parallel/apps/iploggerapp.py b/IPython/parallel/apps/iploggerapp.py index 36356e2..774ebd2 100755 --- a/IPython/parallel/apps/iploggerapp.py +++ b/IPython/parallel/apps/iploggerapp.py @@ -31,7 +31,7 @@ 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 @@ 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() diff --git a/IPython/zmq/ipkernel.py b/IPython/zmq/ipkernel.py index b8caa2e..cef40f1 100755 --- a/IPython/zmq/ipkernel.py +++ b/IPython/zmq/ipkernel.py @@ -28,7 +28,7 @@ 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 @@ class IPKernelApp(KernelApp, InteractiveShellApp): """ ) - @catch_config + @catch_config_error def initialize(self, argv=None): super(IPKernelApp, self).initialize(argv) self.init_shell() diff --git a/IPython/zmq/kernelapp.py b/IPython/zmq/kernelapp.py index 94f94db..1e3866e 100644 --- a/IPython/zmq/kernelapp.py +++ b/IPython/zmq/kernelapp.py @@ -26,7 +26,7 @@ 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 @@ 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()