From c1d0b69a5976847b19ddbc459e90e5fd0e153866 2012-09-04 00:20:03
From: MinRK <benjaminrk@gmail.com>
Date: 2012-09-04 00:20:03
Subject: [PATCH] use Singleton.instance() for embed() instead of manual global

Any use of get_ipython() could cause funky misbehaving,
potentially invoking another InteractiveShell instance.

One change is calling IPython.embed() from inside a running IPython session will now result in a MultipleInstanceError.

closes #1884
---

diff --git a/IPython/frontend/terminal/embed.py b/IPython/frontend/terminal/embed.py
index c4999c4..a831575 100644
--- a/IPython/frontend/terminal/embed.py
+++ b/IPython/frontend/terminal/embed.py
@@ -264,8 +264,6 @@ class InteractiveShellEmbed(TerminalInteractiveShell):
         self.user_ns = orig_user_ns
         self.compile.flags = orig_compile_flags
 
-_embedded_shell = None
-
 
 def embed(**kwargs):
     """Call this to embed IPython at the current point in your program.
@@ -284,7 +282,7 @@ def embed(**kwargs):
         d = 40
         embed
 
-    Full customization can be done by passing a :class:`Struct` in as the
+    Full customization can be done by passing a :class:`Config` in as the
     config argument.
     """
     config = kwargs.get('config')
@@ -294,7 +292,5 @@ def embed(**kwargs):
         config = load_default_config()
         config.InteractiveShellEmbed = config.TerminalInteractiveShell
         kwargs['config'] = config
-    global _embedded_shell
-    if _embedded_shell is None:
-        _embedded_shell = InteractiveShellEmbed(**kwargs)
-    _embedded_shell(header=header, stack_depth=2, compile_flags=compile_flags)
+    shell = InteractiveShellEmbed.instance(**kwargs)
+    shell(header=header, stack_depth=2, compile_flags=compile_flags)