Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit 85bfaf10175884ad3081e5fb32867695bf73f147 1 parent 86fcb25
Luke Plant authored December 09, 2009

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. 2  django/conf/__init__.py
2  django/conf/__init__.py
@@ -127,7 +127,7 @@ def __getattr__(self, name):
127 127
         return getattr(self.default_settings, name)
128 128
 
129 129
     def __dir__(self):
130  
-        return dir(self) + dir(self.default_settings)
  130
+        return self.__dict__.keys() + dir(self.default_settings)
131 131
 
132 132
     # For Python < 2.6:
133 133
     __members__ = property(lambda self: self.__dir__())

0 notes on commit 85bfaf1

Please sign in to comment.
Something went wrong with that request. Please try again.