python: use ipython in --interactive if it is available

2010-06-14 23:24:46 -07:00
parent 70497d6a18
commit 5fc7adcba0
1 changed files with 7 additions and 2 deletions
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -360,8 +360,13 @@ def main():

    # once the script is done
    if options.interactive:
-        interact = code.InteractiveConsole(scope)
-        interact.interact("M5 Interactive Console")
+        banner = "M5 Interactive Console"
+        try:
+            from IPython.Shell import IPShellEmbed
+            ipshell = IPShellEmbed(banner=banner,user_ns=scope)
+            ipshell()
+        except ImportError:
+            code.InteractiveConsole(scope).interact(banner)

 if __name__ == '__main__':
    from pprint import pprint