Commit 85bfaf10 authored by Luke Plant's avatar Luke Plant
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
parent 86fcb257

django/conf/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -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__())