Skip to content

Commit

Permalink
Drop BaseCommand.option_list support
Browse files Browse the repository at this point in the history
This was using prior to Django 1.8, when management commands used
optparse instead of argparse.
  • Loading branch information
jwhitlock committed Jun 27, 2016
1 parent 9f0fdd3 commit d08492e
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions django_nose/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from django.apps import apps
from django.conf import settings
from django.core import exceptions
from django.core.management.base import BaseCommand
from django.core.management.color import no_style
from django.core.management.commands.loaddata import Command
from django.db import connections, transaction, DEFAULT_DB_ALIAS
Expand Down Expand Up @@ -273,12 +272,6 @@ def run_tests(self, test_labels, extra_tests=None):
if hasattr(settings, 'NOSE_ARGS'):
nose_argv.extend(settings.NOSE_ARGS)

# Skip over 'manage.py test' and any arguments handled by django.
django_opts = self.django_opts[:]
for opt in getattr(BaseCommand, 'option_list', []):
django_opts.extend(opt._long_opts)
django_opts.extend(opt._short_opts)

# Recreate the arguments in a nose-compatible format
arglist = sys.argv[1:]
has_nargs = getattr(self, '_has_nargs', set(['--verbosity']))
Expand All @@ -287,7 +280,7 @@ def run_tests(self, test_labels, extra_tests=None):
if not opt.startswith('-'):
# Discard test labels
continue
if any(opt.startswith(d) for d in django_opts):
if any(opt.startswith(d) for d in self.django_opts):
# Discard options handled by Djangp
continue

Expand Down

0 comments on commit d08492e

Please sign in to comment.