Kaydet (Commit) f65b1aee authored tarafından Tim Graham's avatar Tim Graham

Refs #25838 -- Removed the deprecated shell --plain option.

üst 9d304b26
import os import os
import select import select
import sys import sys
import warnings
from django.core.management import BaseCommand, CommandError from django.core.management import BaseCommand, CommandError
from django.utils.datastructures import OrderedSet from django.utils.datastructures import OrderedSet
from django.utils.deprecation import RemovedInDjango20Warning
class Command(BaseCommand): class Command(BaseCommand):
...@@ -19,11 +17,6 @@ class Command(BaseCommand): ...@@ -19,11 +17,6 @@ class Command(BaseCommand):
shells = ['ipython', 'bpython', 'python'] shells = ['ipython', 'bpython', 'python']
def add_arguments(self, parser): def add_arguments(self, parser):
parser.add_argument(
'--plain', action='store_true', dest='plain',
help='Tells Django to use plain Python, not IPython or bpython. '
'Deprecated, use the `-i python` or `--interface python` option instead.',
)
parser.add_argument( parser.add_argument(
'--no-startup', action='store_true', dest='no_startup', '--no-startup', action='store_true', dest='no_startup',
help='When using plain Python, ignore the PYTHONSTARTUP environment variable and ~/.pythonrc.py script.', help='When using plain Python, ignore the PYTHONSTARTUP environment variable and ~/.pythonrc.py script.',
...@@ -83,13 +76,6 @@ class Command(BaseCommand): ...@@ -83,13 +76,6 @@ class Command(BaseCommand):
code.interact(local=imported_objects) code.interact(local=imported_objects)
def handle(self, **options): def handle(self, **options):
if options['plain']:
warnings.warn(
"The --plain option is deprecated in favor of the -i python or --interface python option.",
RemovedInDjango20Warning
)
options['interface'] = 'python'
# Execute the command and exit. # Execute the command and exit.
if options['command']: if options['command']:
exec(options['command']) exec(options['command'])
......
...@@ -951,11 +951,6 @@ Python interpreter, use ``python`` as the interface name, like so:: ...@@ -951,11 +951,6 @@ Python interpreter, use ``python`` as the interface name, like so::
django-admin shell -i python django-admin shell -i python
.. deprecated:: 1.10
In older versions, use the ``--plain`` option instead of ``-i python``. This
is deprecated and will be removed in Django 2.0.
.. _IPython: https://ipython.org/ .. _IPython: https://ipython.org/
.. _bpython: http://bpython-interpreter.org/ .. _bpython: http://bpython-interpreter.org/
......
...@@ -338,3 +338,5 @@ these features. ...@@ -338,3 +338,5 @@ these features.
is removed. is removed.
* ``django.utils.functional.allow_lazy()`` is removed. * ``django.utils.functional.allow_lazy()`` is removed.
* The ``shell --plain`` option is removed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment