Drop nested() function for context managers

IPython/terminal/console/interactiveshell.py

@@ -25,11 +25,6 b' import base64'
 
 from Queue import Empty
 
-try:
-    from contextlib import nested
-except:
-    from IPython.utils.nested_context import nested
-
 from IPython.core import page
 from IPython.utils.warn import warn, error
 from IPython.utils import io
@@ -303,8 +298,8 b' class ZMQTerminalInteractiveShell(TerminalInteractiveShell):'
         raw = base64.decodestring(data[mime].encode('ascii'))
         imageformat = self._imagemime[mime]
         filename = 'tmp.{0}'.format(imageformat)
-        with nested(NamedFileInTemporaryDirectory(filename),
-                    open(os.devnull, 'w')) as (f, devnull):
+        with NamedFileInTemporaryDirectory(filename) as f, \
+                    open(os.devnull, 'w') as devnull:
             f.write(raw)
             f.flush()
             fmt = dict(file=f.name, format=imageformat)

IPython/terminal/embed.py

@@ -27,13 +27,6 b' from __future__ import with_statement'
 import sys
 import warnings
 
-# We need to use nested to support python 2.6, once we move to >=2.7, we can
-# use the with keyword's new builtin support for nested managers
-try:
-    from contextlib import nested
-except:
-    from IPython.utils.nested_context import nested
-
 from IPython.core import ultratb, compilerop
 from IPython.core.magic import Magics, magics_class, line_magic
 from IPython.terminal.interactiveshell import TerminalInteractiveShell
@@ -251,7 +244,7 b' class InteractiveShellEmbed(TerminalInteractiveShell):'
         # actually completes using the frame's locals/globals
         self.set_completer_frame()
 
-        with nested(self.builtin_trap, self.display_trap):
+        with self.builtin_trap, self.display_trap:
             self.interact(display_banner=display_banner)
         
         # now, purge out the local namespace of IPython's hidden variables.

IPython/terminal/interactiveshell.py

@@ -19,13 +19,6 b' import bdb'
 import os
 import sys
 
-# We need to use nested to support python 2.6, once we move to >=2.7, we can
-# use the with keyword's new builtin support for nested managers
-try:
-    from contextlib import nested
-except:
-    from IPython.utils.nested_context import nested
-
 from IPython.core.error import TryNext, UsageError
 from IPython.core.usage import interactive_usage, default_banner
 from IPython.core.inputsplitter import IPythonInputSplitter
@@ -429,7 +422,7 b' class TerminalInteractiveShell(InteractiveShell):'
         internally created default banner.
         """
 
-        with nested(self.builtin_trap, self.display_trap):
+        with self.builtin_trap, self.display_trap:
 
             while 1:
                 try: