From 2bcbe9085b7be5e11d88071724452cb4b857cf80 2011-05-05 20:57:47
From: MinRK <benjaminrk@gmail.com>
Date: 2011-05-05 20:57:47
Subject: [PATCH] short error message on AliasError in run_cell
instead of full traceback

use prefilter_failed flag to prevent duplicate code
---

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 7e130d5..db40bec 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -38,7 +38,7 @@ from IPython.core import page
 from IPython.core import prefilter
 from IPython.core import shadowns
 from IPython.core import ultratb
-from IPython.core.alias import AliasManager
+from IPython.core.alias import AliasManager, AliasError
 from IPython.core.autocall import ExitAutocall
 from IPython.core.builtin_trap import BuiltinTrap
 from IPython.core.compilerop import CachingCompiler
@@ -2129,22 +2129,18 @@ class InteractiveShell(Configurable, Magic):
         cell = self.input_splitter.source_reset()
         
         with self.builtin_trap:
+            prefilter_failed = False
             if len(cell.splitlines()) == 1:
                 try:
                     cell = self.prefilter_manager.prefilter_lines(cell)
+                except AliasError as e:
+                    error(e)
+                    prefilter_failed=True
                 except Exception:
-                    # don't allow prefilter errors to crash IPython, because
-                    # user code can be involved (e.g. aliases)
+                    # don't allow prefilter errors to crash IPython
                     self.showtraceback()
-                    if store_history:
-                        self.history_manager.store_inputs(self.execution_count, 
-                                                          cell, raw_cell)
-
-                    self.logger.log(cell, raw_cell)
-                    self.execution_count += 1
-                    
-                    return
-            
+                    prefilter_failed = True
+                
             # Store raw and processed history
             if store_history:
                 self.history_manager.store_inputs(self.execution_count, 
@@ -2152,30 +2148,32 @@ class InteractiveShell(Configurable, Magic):
 
             self.logger.log(cell, raw_cell)
             
-            cell_name = self.compile.cache(cell, self.execution_count)
+            if not prefilter_failed:
+                # don't run if prefilter failed
+                cell_name = self.compile.cache(cell, self.execution_count)
             
-            with self.display_trap:
-                try:
-                    code_ast = ast.parse(cell, filename=cell_name)
-                except (OverflowError, SyntaxError, ValueError, TypeError,
-                        MemoryError):
-                    self.showsyntaxerror()
-                    self.execution_count += 1
-                    return None
-
-                self.run_ast_nodes(code_ast.body, cell_name,
-                                                    interactivity="last_expr")
-
-                # Execute any registered post-execution functions.
-                for func, status in self._post_execute.iteritems():
-                    if not status:
-                        continue
+                with self.display_trap:
                     try:
-                        func()
-                    except:
-                        self.showtraceback()
-                        # Deactivate failing function
-                        self._post_execute[func] = False
+                        code_ast = ast.parse(cell, filename=cell_name)
+                    except (OverflowError, SyntaxError, ValueError, TypeError,
+                            MemoryError):
+                        self.showsyntaxerror()
+                        self.execution_count += 1
+                        return None
+            
+                    self.run_ast_nodes(code_ast.body, cell_name,
+                                                        interactivity="last_expr")
+            
+                    # Execute any registered post-execution functions.
+                    for func, status in self._post_execute.iteritems():
+                        if not status:
+                            continue
+                        try:
+                            func()
+                        except:
+                            self.showtraceback()
+                            # Deactivate failing function
+                            self._post_execute[func] = False
                 
         if store_history:
             # Write output to the database. Does nothing unless
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index cf1ea96..904e6f8 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -20,7 +20,10 @@ Authors
 #-----------------------------------------------------------------------------
 # stdlib
 import unittest
+from cStringIO import StringIO
+
 from IPython.testing import decorators as dec
+from IPython.utils import io
 
 #-----------------------------------------------------------------------------
 # Tests
@@ -96,4 +99,11 @@ class InteractiveShellTestCase(unittest.TestCase):
         """Errors in prefilter can't crash IPython"""
         ip = get_ipython()
         ip.run_cell('%alias parts echo first %s second %s')
+        # capture stderr:
+        save_err = io.stderr
+        io.stderr = StringIO()
         ip.run_cell('parts 1')
+        err = io.stderr.getvalue()
+        io.stderr = save_err
+        self.assertEquals(err.split(':')[0], 'ERROR')
+