summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-07-16 04:45:45 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-07-16 04:45:45 +0000
commit41a6e41777a9d02cfcbfed534ebf4199158c7030 (patch)
treecf0370dc9600a93a2c6f956d1e7d5f579fe6e42f
parent5dd9a2ab38a79457ba9c21f07ca855727f9568a3 (diff)
Fixed #4884 -- Fixed an initialisation problem when assigned to settings before
accessing them. Thanks, Noam Raphael. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 021ecc8131..f28da2d764 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -37,6 +37,8 @@ class LazySettings(object):
# __setattr__(), which would be an infinite loop.
self.__dict__['_target'] = value
else:
+ if self._target is None:
+ self._import_settings()
setattr(self._target, name, value)
def _import_settings(self):