summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2012-01-19 17:38:56 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2012-01-19 17:38:56 +0000
commite8e4293a485fc51d7b699c24e5d1340fdee25d03 (patch)
tree2ebe27b364f9dd8c64809429feef11ebe49f4e7b
parent203c4fef4d4f9c3a241cef0927ae895fcfe9ec48 (diff)
Fixed #17078: properly invoke IPython 0.12.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/management/commands/shell.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py
index a8c9456e63..26cbd7f005 100644
--- a/django/core/management/commands/shell.py
+++ b/django/core/management/commands/shell.py
@@ -13,9 +13,8 @@ class Command(NoArgsCommand):
def ipython(self):
try:
- from IPython.frontend.terminal.embed import TerminalInteractiveShell
- shell = TerminalInteractiveShell()
- shell.mainloop()
+ from IPython import embed
+ embed()
except ImportError:
# IPython < 0.11
# Explicitly pass an empty list as arguments, because otherwise