Permalink
Browse files

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
  • Loading branch information...
1 parent 86fcb25 commit 85bfaf10175884ad3081e5fb32867695bf73f147 @spookylukey spookylukey committed Dec 9, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 django/conf/__init__.py
View
2 django/conf/__init__.py
@@ -127,7 +127,7 @@ def __getattr__(self, name):
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__())

0 comments on commit 85bfaf1

Please sign in to comment.