Author: Alex
Date: 2011-06-01 13:45:47 -0700 (Wed, 01 Jun 2011)
New Revision: 16310
Modified:
django/trunk/django/conf/__init__.py
django/trunk/tests/regressiontests/staticfiles_tests/tests.py
Log:
Fix the staticfiles_tests and django.conf to not think that None meant a lazy
object hadn't been evaluated. Thanks to Jannis for informing me that I broke
the test suite (if you were harmed by this I'll buy you a cookie). Sorry.
Modified: django/trunk/django/conf/__init__.py
===================================================================
--- django/trunk/django/conf/__init__.py 2011-06-01 20:14:25 UTC (rev
16309)
+++ django/trunk/django/conf/__init__.py 2011-06-01 20:45:47 UTC (rev
16310)
@@ -12,7 +12,7 @@
import warnings
from django.conf import global_settings
-from django.utils.functional import LazyObject
+from django.utils.functional import LazyObject, empty
from django.utils import importlib
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -47,19 +47,19 @@
parameter sets where to retrieve any unspecified values from (its
argument must support attribute access (__getattr__)).
"""
- if self._wrapped != None:
+ if self._wrapped is not empty:
raise RuntimeError('Settings already configured.')
holder = UserSettingsHolder(default_settings)
for name, value in options.items():
setattr(holder, name, value)
self._wrapped = holder
+ @property
def configured(self):
"""
Returns True if the settings have already been configured.
"""
- return bool(self._wrapped)
- configured = property(configured)
+ return self._wrapped is not empty
class BaseSettings(object):
Modified: django/trunk/tests/regressiontests/staticfiles_tests/tests.py
===================================================================
--- django/trunk/tests/regressiontests/staticfiles_tests/tests.py
2011-06-01 20:14:25 UTC (rev 16309)
+++ django/trunk/tests/regressiontests/staticfiles_tests/tests.py
2011-06-01 20:45:47 UTC (rev 16310)
@@ -14,6 +14,7 @@
from django.core.management import call_command
from django.test import TestCase
from django.utils.encoding import smart_unicode
+from django.utils.functional import empty
from django.utils._os import rmtree_errorhandler
@@ -61,7 +62,7 @@
# Clear the cached default_storage out, this is because when it first
# gets accessed (by some other test), it evaluates settings.MEDIA_ROOT,
# since we're planning on changing that we need to clear out the cache.
- default_storage._wrapped = None
+ default_storage._wrapped = empty
# To make sure SVN doesn't hangs itself with the non-ASCII characters
# during checkout, we actually create one file dynamically.
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
