Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 85bfaf10175884ad3081e5fb32867695bf73f147 1 parent 86fcb25
@spookylukey spookylukey authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  django/conf/
2  django/conf/
@@ -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__())
Please sign in to comment.
Something went wrong with that request. Please try again.