Merge pull request scrapy#856 from eliasdorneles/fix-embed-ipython-shell

fix IPython shell scope issue by using IPython.embed()
DamonGuo · Aug 19, 2014 · c4f9e9d · c4f9e9d
2 parents 8360380 + 6f50cf5
commit c4f9e9d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/scrapy/utils/console.py b/scrapy/utils/console.py
@@ -13,16 +13,16 @@ def start_python_console(namespace=None, noipython=False, banner=''):
                 raise ImportError()
 
             try:
-                try:
-                    from IPython.terminal import embed
-                except ImportError:
-                    from IPython.frontend.terminal import embed
-                sh = embed.InteractiveShellEmbed(banner1=banner)
+                from IPython.terminal.embed import InteractiveShellEmbed
+                from IPython.terminal.ipapp import load_default_config
             except ImportError:
-                from IPython.Shell import IPShellEmbed
-                sh = IPShellEmbed(banner=banner)
+                from IPython.frontend.terminal.embed import InteractiveShellEmbed
+                from IPython.frontend.terminal.ipapp import load_default_config
 
-            sh(global_ns={}, local_ns=namespace)
+            config = load_default_config()
+            shell = InteractiveShellEmbed(
+                banner1=banner, user_ns=namespace, config=config)
+            shell()
         except ImportError:
             import code
             try: # readline module is only available on unix systems