From 85bfaf10175884ad3081e5fb32867695bf73f147 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Wed, 9 Dec 2009 01:34:47 +0000 Subject: [PATCH] Fixed #12336 - infinite recursion in dir(UserSettingsHolder) This is a regression introduced in trunk, so it does not need to be backported. Thanks to miracle2k for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11799 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 7fbfd26534..8dd028414a 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -127,7 +127,7 @@ class UserSettingsHolder(object): return getattr(self.default_settings, name) def __dir__(self): - return dir(self) + dir(self.default_settings) + return self.__dict__.keys() + dir(self.default_settings) # For Python < 2.6: __members__ = property(lambda self: self.__dir__())