From 7d0e9ca457ba5088a3c7812ab5628d4bca262d4d Mon Sep 17 00:00:00 2001
From: Guillaume Valadon <guillaume@valadon.net>
Date: Fri, 25 Jul 2014 11:13:12 +0200
Subject: [PATCH] IPython support fixed
--HG--
branch : Issue #329
---
scapy/main.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/scapy/main.py b/scapy/main.py
index aad5a152..0fce8c3e 100644
--- a/scapy/main.py
+++ b/scapy/main.py
@@ -341,9 +341,18 @@ def interact(mydict=None,argv=None,mybanner=None,loglevel=20):
if IPYTHON:
banner = the_banner % (conf.version) + " using IPython %s" % IPython.__version__
- args = [''] # IPython command line args (will be seen as sys.argv)
- ipshell = IPython.Shell.IPShellEmbed(args, banner = banner)
- ipshell(local_ns=session)
+
+ # Old way to embed IPython kept for backward compatibility
+ try:
+ args = [''] # IPython command line args (will be seen as sys.argv)
+ ipshell = IPython.Shell.IPShellEmbed(args, banner = banner)
+ ipshell(local_ns=session)
+ except AttributeError, e:
+ pass
+
+ # In the IPython cookbook, see 'Updating-code-for-use-with-IPython-0.11-and-later'
+ IPython.embed(user_ns=session, banner2=banner)
+
else:
code.interact(banner = the_banner % (conf.version),
local=session, readfunc=conf.readfunc)
--
GitLab