Hopiu/django-configurations
1
0
Fork 0
mirror of https://github.com/jazzband/django-configurations.git synced 2026-03-16 22:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f514eac8af into 5ece107044

Browse source
This commit is contained in:
Svetchine 2015-04-05 13:03:24 +00:00
commit 1b6f937ed8
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configurations/importer.py
View file

@ -39,7 +39,8 @@ def install(check_options=False):
# will actually return a OptionParser for backward
# compatibility. It uses BaseCommand.use_argparse
# to decide that, which checks for the option_list list
base.BaseCommand.option_list += configuration_options
if configuration_options[0] not in base.BaseCommand.option_list:
base.BaseCommand.option_list += configuration_options
else:
# probably argparse, let's not import argparse though
parser.add_argument(CONFIGURATION_ARGUMENT,
@ -104,7 +105,7 @@ class ConfigurationImporter(object):
base.handle_default_options(options)
except base.CommandError:
pass # Ignore any option errors at this point.
# django < 1.7 did use optparse
# django <= 1.7 did use optparse
else:
from django.core.management import LaxOptionParser
parser = LaxOptionParser(option_list=configuration_options,