summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-12-31 09:56:26 -0500
committerTim Graham <timograham@gmail.com>2017-01-17 20:52:02 -0500
commitf65b1aee71dfb17dcf5738545db3f3fdf980fe72 (patch)
treeec95fb6c3901bee7fa509c99f9f29e65ebe2cc21 /django
parent9d304b26cf2ce071a682bf68a29dee04d0e4cfdb (diff)
Refs #25838 -- Removed the deprecated shell --plain option.
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/shell.py14
1 files changed, 0 insertions, 14 deletions
diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py
index de8f33ed84..ce4d9daa7e 100644
--- a/django/core/management/commands/shell.py
+++ b/django/core/management/commands/shell.py
@@ -1,11 +1,9 @@
import os
import select
import sys
-import warnings
from django.core.management import BaseCommand, CommandError
from django.utils.datastructures import OrderedSet
-from django.utils.deprecation import RemovedInDjango20Warning
class Command(BaseCommand):
@@ -20,11 +18,6 @@ class Command(BaseCommand):
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(
'--no-startup', action='store_true', dest='no_startup',
help='When using plain Python, ignore the PYTHONSTARTUP environment variable and ~/.pythonrc.py script.',
)
@@ -83,13 +76,6 @@ class Command(BaseCommand):
code.interact(local=imported_objects)
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.
if options['command']:
exec(options['command'])