diff options
| author | Luke Plant <L.Plant.98@cantab.net> | 2009-12-09 01:34:47 +0000 |
|---|---|---|
| committer | Luke Plant <L.Plant.98@cantab.net> | 2009-12-09 01:34:47 +0000 |
| commit | 85bfaf10175884ad3081e5fb32867695bf73f147 (patch) | |
| tree | 9f769e598b3a7726252e7c71c27b53a885689746 | |
| parent | 86fcb25749ffe05840fd0e119d3342fe9bac00ff (diff) | |
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
| -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 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__()) |