diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-12-12 23:03:24 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-12-12 23:03:24 +0000 |
| commit | 05eb53603c69b46b70226bfdb2242732b2b169fa (patch) | |
| tree | d9e6d141f9cfccbcdbf11a33ce2941a7d4a6012d | |
| parent | 47a5153da4216db4a4262047c513450a2a154d62 (diff) | |
Fixed #14187 -- Added support for bpython to shell management command. Thanks, Jeremy Dunck.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/management/commands/shell.py | 6 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py index f08de4e892..e4ce462c20 100644 --- a/django/core/management/commands/shell.py +++ b/django/core/management/commands/shell.py @@ -8,7 +8,7 @@ class Command(NoArgsCommand): help='Tells Django to use plain Python, not IPython.'), ) help = "Runs a Python interactive interpreter. Tries to use IPython, if it's available." - shells = ['ipython'] + shells = ['ipython', 'bpython'] requires_model_validation = False def ipython(self): @@ -28,6 +28,10 @@ class Command(NoArgsCommand): # IPython not found at all, raise ImportError raise + def bpython(self): + import bpython + bpython.embed() + def run_shell(self): for shell in self.shells: try: diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 37e12c4cd8..438c599902 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -747,13 +747,14 @@ shell Starts the Python interactive interpreter. -Django will use IPython_, if it's installed. If you have IPython installed and -want to force use of the "plain" Python interpreter, use the ``--plain`` -option, like so:: +Django will use IPython_ or bpython_ if either is installed. If you have a +rich shell installed but want to force use of the "plain" Python interpreter, +use the ``--plain`` option, like so:: django-admin.py shell --plain .. _IPython: http://ipython.scipy.org/ +.. _bpython: http://bpython-interpreter.org/ sql <appname appname ...> ------------------------- |