diff options
| author | Hasan Ramezani <hasan.r67@gmail.com> | 2018-08-18 23:57:39 +0430 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-08-20 12:59:27 -0400 |
| commit | 49b679371fe9beddcd23a93b5fdbadea914f37f8 (patch) | |
| tree | 2d2461a9d632e45219daa220c98470fe96f8409b /django | |
| parent | cfb4845f061ed6e81e9b5a1873d1c08d98c4b5a9 (diff) | |
Fixed #29236 -- Fixed diffsettings crash if using settings.configure().
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/management/commands/diffsettings.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/management/commands/diffsettings.py b/django/core/management/commands/diffsettings.py index 972128b8cb..d82d4a9da8 100644 --- a/django/core/management/commands/diffsettings.py +++ b/django/core/management/commands/diffsettings.py @@ -42,7 +42,8 @@ class Command(BaseCommand): from django.conf import settings, Settings, global_settings # Because settings are imported lazily, we need to explicitly load them. - settings._setup() + if not settings.configured: + settings._setup() user_settings = module_to_dict(settings._wrapped) default = options['default'] |