Merge pull request #242 from rhr/master

fix for using the shell with IPython >= 1.0
2013-10-06 19:37:56 -07:00
parent 86d8b8dece 46e2a663e9
commit 0e98544a79
1 changed files with 4 additions and 1 deletions
--- a/gluon/shell.py
+++ b/gluon/shell.py
@@ -288,7 +288,10 @@ def run(
            else:
                try:
                    import IPython
-                    if IPython.__version__ >= '0.11':
+                    if IPython.__version__ >= '1.0':
+                        IPython.start_ipython(user_ns=_env)
+                        return
+                    elif IPython.__version__ >= '0.11':
                        from IPython.frontend.terminal.embed import InteractiveShellEmbed
                        shell = InteractiveShellEmbed(user_ns=_env)
                        shell()