summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2012-01-19 17:39:59 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2012-01-19 17:39:59 +0000
commit2b793b1a3580a318ba8a505f8a70942bf849de25 (patch)
treeecf72511156959e6790631a334ccb95313c8e0d1 /django
parent9bc6119daf03d5f33095f52b5eac1aed1359c775 (diff)
[1.3.X] Fixed #17078: properly invoke IPython 0.12.
Backport of r17379. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-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 e4ce462c20..039ebb8d5d 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