From 10f1f8c6a49fa96ffb420eaa8cdd3641128ec9ec Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Sun, 10 Feb 2013 13:23:56 +0100 Subject: base: Fix broken IPython argument handling Prior to this changeset, we used to clear sys.argv before entering the IPython shell. This caused some versions of IPython to crash because they assume argv[0] to exist. The correct way of overriding the arguments passed to IPython is to set the argv keyword argument when initializing the shell. --- src/python/m5/main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/python/m5/main.py b/src/python/m5/main.py index ce2979cd2..03fab9901 100644 --- a/src/python/m5/main.py +++ b/src/python/m5/main.py @@ -129,10 +129,9 @@ def parse_options(): def interact(scope): banner = "gem5 Interactive Console" - sys.argv = [] try: from IPython.Shell import IPShellEmbed - ipshell = IPShellEmbed(banner=banner,user_ns=scope) + ipshell = IPShellEmbed(argv=[], banner=banner, user_ns=scope) ipshell() except ImportError: code.InteractiveConsole(scope).interact(banner) -- cgit v1.2.3