mirror of
https://github.com/django/django.git
synced 2025-06-05 11:39:13 +00:00
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:
parent
86fcb25749
commit
85bfaf1017
@ -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__())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user