test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Luke Plant 2009-12-09 01:34:47 +00:00
parent 86fcb25749
commit 85bfaf1017
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/conf/__init__.py
View File

@ -127,7 +127,7 @@ class UserSettingsHolder(object):
return getattr(self.default_settings, name) return getattr(self.default_settings, name)
def __dir__(self): def __dir__(self):
return dir(self) + dir(self.default_settings) return self.__dict__.keys() + dir(self.default_settings)
# For Python < 2.6: # For Python < 2.6:
__members__ = property(lambda self: self.__dir__()) __members__ = property(lambda self: self.__dir__())