From 8ef8bc0f64c463684268a7c55f3d3da4de066c0d Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Fri, 28 Sep 2018 18:57:12 +0500 Subject: Refs #28909 -- Simplifed code using unpacking generalizations. --- django/conf/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/conf/__init__.py') 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 ) -- cgit v1.3