diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2018-09-28 18:57:12 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-09-28 09:57:12 -0400 |
| commit | 8ef8bc0f64c463684268a7c55f3d3da4de066c0d (patch) | |
| tree | 9c3ab782c6382bdbc91363d0dd5513df83381903 /django/conf/__init__.py | |
| parent | 4fc8fb7ddaad495d45d53df58b2d13115857b3c7 (diff) | |
Refs #28909 -- Simplifed code using unpacking generalizations.
Diffstat (limited to 'django/conf/__init__.py')
| -rw-r--r-- | django/conf/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 05c603786e..062975b1c6 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -182,7 +182,7 @@ class UserSettingsHolder: def __dir__(self): return sorted( - s for s in list(self.__dict__) + dir(self.default_settings) + s for s in [*self.__dict__, *dir(self.default_settings)] if s not in self._deleted ) |