Fix so exit is detected as an automagic and exits qtconsole.

IPython/core/interactiveshell.py

@@ -2094,23 +2094,28 b' class InteractiveShell(Configurable, Magic):'
         # Store the untransformed code
         raw_cell = cell
         
-        # We need to break up the input into executable blocks that can be run
-        # in 'single' mode, to provide comfortable user behavior.
+        
+        # Code transformation and execution must take place with our
+        # modifications to builtins.
+        with self.builtin_trap:
+            
+            # We need to break up the input into executable blocks that can
+            # be runin 'single' mode, to provide comfortable user behavior.
         blocks = self.input_splitter.split_blocks(cell)
         
         if not blocks:   # Blank cell
             return
         
-        # We only do dynamic transforms on a single line. But a macro can
-        # be expanded to several lines, so we need to split it into input
-        # blocks again.
+            # We only do dynamic transforms on a single line. But a macro
+            # can be expanded to several lines, so we need to split it
+            # into input blocks again.
         if len(cell.splitlines()) <= 1:
             cell = self.prefilter_manager.prefilter_line(blocks[0])
             blocks = self.input_splitter.split_blocks(cell)
 
-        # Store the 'ipython' version of the cell as well, since that's what
-        # needs to go into the translated history and get executed (the
-        # original cell may contain non-python syntax).
+            # Store the 'ipython' version of the cell as well, since
+            # that's what needs to go into the translated history and get
+            # executed (the original cell may contain non-python syntax).
         cell = ''.join(blocks)
 
         # Store raw and processed history
@@ -2120,8 +2125,9 b' class InteractiveShell(Configurable, Magic):'
 
         self.logger.log(cell, raw_cell)
 
-        # All user code execution must happen with our context managers active
-        with nested(self.builtin_trap, self.display_trap):
+            # All user code execution should take place with our
+            # modified displayhook.
+            with self.display_trap:
 
             # Single-block input should behave like an interactive prompt
             if len(blocks) == 1:
@@ -2130,7 +2136,8 b' class InteractiveShell(Configurable, Magic):'
                 # history output logging is enabled.
                 if store_history:
                     self.history_manager.store_output(self.execution_count)
-                    # since we return here, we need to update the execution count
+                        # Since we return here, we need to update the
+                        # execution count
                     self.execution_count += 1
                 return out
 
@@ -2151,7 +2158,8 b' class InteractiveShell(Configurable, Magic):'
                 retcode = self.run_source(ipy_body, symbol='exec',
                                           post_execute=False)
                 if retcode==0:
-                    # Last expression compiled as 'single' so it produces output
+                        # Last expression compiled as 'single' so it
+                        # produces output
                     self.run_source(last)
             else:
                 # Run the whole cell as one entity, storing both raw and