Commit 47a5153d authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed #12735, #14892 and #11542 -- Fixed support for the latest IPython... 

Fixed #12735, #14892 and #11542 -- Fixed support for the latest IPython (development) version in the shell management command and added a hook to implement additional shell runners (by subclassing django.core.management.commands.shell.Command, extending the ``shells`` attribute and implement a method with the same name).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 9ab85e05

django/core/management/commands/shell.py

+27 −6
Original line number Diff line number Diff line
@@ -8,9 +8,34 @@ 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']

    requires_model_validation = False



    def ipython(self):

        try:

            from IPython.frontend.terminal.embed import TerminalInteractiveShell

            shell = TerminalInteractiveShell()

            shell.mainloop()

        except ImportError:

            # IPython < 0.11

            # Explicitly pass an empty list as arguments, because otherwise

            # IPython would use sys.argv from this script.

            try:

                from IPython.Shell import IPShell

                shell = IPShell(argv=[])

                shell.mainloop()

            except ImportError:

                # IPython not found at all, raise ImportError

                raise



    def run_shell(self):

        for shell in self.shells:

            try:

                return getattr(self, shell)()

            except ImportError:

                pass

        raise ImportError



    def handle_noargs(self, **options):

        # XXX: (Temporary) workaround for ticket #1796: force early loading of all

        # models from installed apps.
@@ -23,11 +48,7 @@ class Command(NoArgsCommand): 
            if use_plain:

                # Don't bother loading IPython, because the user wants plain Python.

                raise ImportError

            import IPython

            # Explicitly pass an empty list as arguments, because otherwise IPython

            # would use sys.argv from this script.

            shell = IPython.Shell.IPShell(argv=[])

            shell.mainloop()

            self.run_shell()

        except ImportError:

            import code

            # Set up a dictionary to serve as the environment for the shell, so