Merge pull request #1008 from minrk/excepthook

Use a much more restrained crash handler by default.

Now the excepthook shows a regular traceback, with a brief message about reporting bugs and how to enable to the big crash handler.  Our previous, extremely verbose crash handler can still be activated via `%config Application.verbose_crash=True`, so we can debug real crashes or ask users for extra detail easily.

Small fixes along the way:

* current Application added to configurables list, for use in %config.

* email addresses in full crash reports changed to ipython-dev, so they don't go straight to individual users.

Should close  #695, and ameliorate  #833 (doesn't fix the bug, but the message is more sensible).

IPython/core/application.py

@@ -137,6 +137,11 b' class BaseIPythonApplication(Application):'
         profile, then they will be staged into the new directory.  Otherwise,
         default config files will be automatically generated.
         """)
+    
+    verbose_crash = Bool(False, config=True,
+        help="""Create a massive crash report when IPython enconters what may be an
+        internal error.  The default is to append a short message to the
+        usual traceback""")
 
     # The class to use as the crash handler.
     crash_handler_class = Type(crashhandler.CrashHandler)
@@ -154,11 +159,23 b' class BaseIPythonApplication(Application):'
     def init_crash_handler(self):
         """Create a crash handler, typically setting sys.excepthook to it."""
         self.crash_handler = self.crash_handler_class(self)
-        sys.excepthook = self.crash_handler
+        sys.excepthook = self.excepthook
         def unset_crashhandler():
             sys.excepthook = sys.__excepthook__
         atexit.register(unset_crashhandler)
-
+    
+    def excepthook(self, etype, evalue, tb):
+        """this is sys.excepthook after init_crashhandler
+        
+        set self.verbose_crash=True to use our full crashhandler, instead of
+        a regular traceback with a short message (crash_handler_lite)
+        """
+        
+        if self.verbose_crash:
+            return self.crash_handler(etype, evalue, tb)
+        else:
+            return crashhandler.crash_handler_lite(etype, evalue, tb)
+    
     def _ipython_dir_changed(self, name, old, new):
         if old in sys.path:
             sys.path.remove(old)

IPython/core/crashhandler.py

@@ -21,9 +21,11 b' Authors:'
 
 import os
 import sys
+import traceback
 from pprint import pformat
 
 from IPython.core import ultratb
+from IPython.core.release import author_email
 from IPython.utils.sysinfo import sys_info
 
 #-----------------------------------------------------------------------------
@@ -54,6 +56,15 b' To ensure accurate tracking of this issue, please file a report about it at:'
 {bug_tracker}
 """
 
+_lite_message_template = """
+If you suspect this is an IPython bug, please report it at:
+    https://github.com/ipython/ipython/issues
+or send an email to the mailing list at {email}
+
+You can enable a much more verbose traceback with:
+    {config}Application.verbose_crash=True
+"""
+
 
 class CrashHandler(object):
     """Customizable crash handlers for IPython applications.
@@ -161,7 +172,7 b' class CrashHandler(object):'
         # Construct report on disk
         report.write(self.make_report(traceback))
         report.close()
-        raw_input("Hit <Enter> to quit this message (your terminal may close):")
+        raw_input("Hit <Enter> to quit (your terminal may close):")
 
     def make_report(self,traceback):
         """Return a string containing a crash report."""
@@ -184,3 +195,17 b' class CrashHandler(object):'
 
         return ''.join(report)
 
+
+def crash_handler_lite(etype, evalue, tb):
+    """a light excepthook, adding a small message to the usual traceback"""
+    traceback.print_exception(etype, evalue, tb)
+    
+    from IPython.core.interactiveshell import InteractiveShell
+    if InteractiveShell.initialized():
+        # we are in a Shell environment, give %magic example
+        config = "%config "
+    else:
+        # we are not in a shell, show generic config
+        config = "c."
+    print >> sys.stderr, _lite_message_template.format(email=author_email, config=config)
+

IPython/frontend/terminal/ipapp.py

@@ -81,8 +81,8 b' class IPAppCrashHandler(CrashHandler):'
 
     def __init__(self, app):
         contact_name = release.authors['Fernando'][0]
-        contact_email = release.authors['Fernando'][1]
-        bug_tracker = 'http://github.com/ipython/ipython/issues'
+        contact_email = release.author_email
+        bug_tracker = 'https://github.com/ipython/ipython/issues'
         super(IPAppCrashHandler,self).__init__(
             app, contact_name, contact_email, bug_tracker
         )
@@ -320,6 +320,7 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
         self.shell = TerminalInteractiveShell.instance(config=self.config,
                         display_banner=False, profile_dir=self.profile_dir,
                         ipython_dir=self.ipython_dir)
+        self.shell.configurables.append(self)
 
     def init_banner(self):
         """optionally display the banner"""

IPython/parallel/apps/baseapp.py

@@ -58,8 +58,8 b' class ParallelCrashHandler(CrashHandler):'
 
     def __init__(self, app):
         contact_name = release.authors['Min'][0]
-        contact_email = release.authors['Min'][1]
-        bug_tracker = 'http://github.com/ipython/ipython/issues'
+        contact_email = release.author_email
+        bug_tracker = 'https://github.com/ipython/ipython/issues'
         super(ParallelCrashHandler,self).__init__(
             app, contact_name, contact_email, bug_tracker
         )

IPython/zmq/ipkernel.py

@@ -780,6 +780,7 b' class IPKernelApp(KernelApp, InteractiveShellApp):'
 
     def init_shell(self):
         self.shell = self.kernel.shell
+        self.shell.configurables.append(self)
 
 
 #-----------------------------------------------------------------------------