diff options
| -rw-r--r-- | django/core/management/commands/shell.py | 28 | ||||
| -rw-r--r-- | docs/releases/1.11.txt | 2 |
2 files changed, 3 insertions, 27 deletions
diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py index 9cc40902f4..fbf79711f6 100644 --- a/django/core/management/commands/shell.py +++ b/django/core/management/commands/shell.py @@ -37,36 +37,10 @@ class Command(BaseCommand): help='Instead of opening an interactive shell, run a command as Django and exit.', ) - def _ipython_pre_011(self): - """Start IPython pre-0.11""" - from IPython.Shell import IPShell - shell = IPShell(argv=[]) - shell.mainloop() - - def _ipython_pre_100(self): - """Start IPython pre-1.0.0""" - from IPython.frontend.terminal.ipapp import TerminalIPythonApp - app = TerminalIPythonApp.instance() - app.initialize(argv=[]) - app.start() - - def _ipython(self): - """Start IPython >= 1.0""" + def ipython(self, options): from IPython import start_ipython start_ipython(argv=[]) - def ipython(self, options): - """Start any version of IPython""" - for ip in (self._ipython, self._ipython_pre_100, self._ipython_pre_011): - try: - ip() - except ImportError: - pass - else: - return - # no IPython, raise ImportError - raise ImportError("No IPython") - def bpython(self, options): import bpython bpython.embed() diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt index a227b712ab..0ccecd9dba 100644 --- a/docs/releases/1.11.txt +++ b/docs/releases/1.11.txt @@ -712,6 +712,8 @@ Miscellaneous * Support for ``cx_Oracle`` < 5.2 is removed. +* Support for IPython < 1.0 is removed from the ``shell`` command. + .. _deprecated-features-1.11: Features deprecated in 1.11 |