diff --git a/IPython/core/application.py b/IPython/core/application.py index 11f1bd7..0d31cff 100644 --- a/IPython/core/application.py +++ b/IPython/core/application.py @@ -144,6 +144,7 @@ class BaseIPythonApplication(Application): # The class to use as the crash handler. crash_handler_class = Type(crashhandler.CrashHandler) + @catch_config_error def __init__(self, **kwargs): super(BaseIPythonApplication, self).__init__(**kwargs) # ensure current working directory exists diff --git a/IPython/parallel/scripts/ipcluster b/IPython/parallel/scripts/ipcluster index 629d390..7c8cfa2 100755 --- a/IPython/parallel/scripts/ipcluster +++ b/IPython/parallel/scripts/ipcluster @@ -11,15 +11,6 @@ #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- -import sys -import traceback - from IPython.parallel.apps.ipclusterapp import launch_new_instance -try: - launch_new_instance() -except: - exc_type, exc_value, exc_traceback = sys.exc_info() - traceback.print_exception(exc_type, exc_value, exc_traceback, - file=sys.stderr) - sys.exit(1) +launch_new_instance() diff --git a/IPython/parallel/scripts/ipcontroller b/IPython/parallel/scripts/ipcontroller index 60bab10..51346a7 100755 --- a/IPython/parallel/scripts/ipcontroller +++ b/IPython/parallel/scripts/ipcontroller @@ -11,15 +11,6 @@ #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- -import sys -import traceback - from IPython.parallel.apps.ipcontrollerapp import launch_new_instance -try: - launch_new_instance() -except: - exc_type, exc_value, exc_traceback = sys.exc_info() - traceback.print_exception(exc_type, exc_value, exc_traceback, - file=sys.stderr) - sys.exit(1) +launch_new_instance() diff --git a/IPython/parallel/scripts/ipengine b/IPython/parallel/scripts/ipengine index 5658b24..aa09d93 100755 --- a/IPython/parallel/scripts/ipengine +++ b/IPython/parallel/scripts/ipengine @@ -11,15 +11,6 @@ #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- -import sys -import traceback - from IPython.parallel.apps.ipengineapp import launch_new_instance -try: - launch_new_instance() -except: - exc_type, exc_value, exc_traceback = sys.exc_info() - traceback.print_exception(exc_type, exc_value, exc_traceback, - file=sys.stderr) - sys.exit(1) +launch_new_instance() diff --git a/IPython/parallel/scripts/iplogger b/IPython/parallel/scripts/iplogger index c2af619..b86dfce 100755 --- a/IPython/parallel/scripts/iplogger +++ b/IPython/parallel/scripts/iplogger @@ -11,15 +11,6 @@ #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- -import sys -import traceback - from IPython.parallel.apps.iploggerapp import launch_new_instance -try: - launch_new_instance() -except: - exc_type, exc_value, exc_traceback = sys.exc_info() - traceback.print_exception(exc_type, exc_value, exc_traceback, - file=sys.stderr) - sys.exit(1) +launch_new_instance() diff --git a/IPython/scripts/ipython b/IPython/scripts/ipython index ddb17f9..b435148 100755 --- a/IPython/scripts/ipython +++ b/IPython/scripts/ipython @@ -1,15 +1,7 @@ #!/usr/bin/env python """Terminal-based IPython entry point. """ -import sys -import traceback from IPython.frontend.terminal.ipapp import launch_new_instance -try: - launch_new_instance() -except: - exc_type, exc_value, exc_traceback = sys.exc_info() - traceback.print_exception(exc_type, exc_value, exc_traceback, - file=sys.stderr) - sys.exit(1) +launch_new_instance()