test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoided catching ImproperlyConfigured on django.setup(). 

Fixed #21737. Thanks Florian for the report.

Also removed redundant imports in that file.
This commit is contained in:
Aymeric Augustin 2014-01-06 22:57:56 +01:00
parent 6a320cc14a
commit 2dcde523ab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/core/management/__init__.py
View File

@ -261,7 +261,6 @@ class ManagementUtility(object):
usage.append(" %s" % name) usage.append(" %s" % name)
# Output an extra note if settings are not properly configured # Output an extra note if settings are not properly configured
try: try:
from django.conf import settings
settings.INSTALLED_APPS settings.INSTALLED_APPS
except ImproperlyConfigured as e: except ImproperlyConfigured as e:
usage.append(style.NOTICE( usage.append(style.NOTICE(
@ -343,7 +342,6 @@ class ManagementUtility(object):
elif cwords[0] in ('dumpdata', 'sql', 'sqlall', 'sqlclear', elif cwords[0] in ('dumpdata', 'sql', 'sqlall', 'sqlclear',
'sqlcustom', 'sqlindexes', 'sqlsequencereset', 'test'): 'sqlcustom', 'sqlindexes', 'sqlsequencereset', 'test'):
try: try:
from django.apps import apps
app_configs = apps.get_app_configs() app_configs = apps.get_app_configs()
# Get the last part of the dotted path as the app name. # Get the last part of the dotted path as the app name.
options += [(app_config.label, 0) for app_config in app_configs] options += [(app_config.label, 0) for app_config in app_configs]
@ -386,10 +384,12 @@ class ManagementUtility(object):
pass # Ignore any option errors at this point. pass # Ignore any option errors at this point.
try: try:
django.setup() settings.INSTALLED_APPS
except ImproperlyConfigured: except ImproperlyConfigured:
# Some commands are supposed to work without configured settings # Some commands are supposed to work without configured settings
pass pass
else:
django.setup()
try: try:
subcommand = self.argv[1] subcommand = self.argv[1]