From 46e2a663e91c45cff6b7469d15c5fdae038039f4 Mon Sep 17 00:00:00 2001
From: Rick Ree <github@rree.fastmail.fm>
Date: Sun, 6 Oct 2013 17:18:04 -0500
Subject: [PATCH] fix for using the shell with IPython >= 1.0

---
 gluon/shell.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gluon/shell.py b/gluon/shell.py
index 88dd6bb7..df7fd2fa 100644
--- 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()