mirror of
https://github.com/django/django.git
synced 2025-08-03 18:38:50 +00:00
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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
9abe734b83
commit
06279e454a
2 changed files with 6 additions and 5 deletions
|
@ -14,6 +14,7 @@ from django.core.files.storage import default_storage
|
|||
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 @@ class StaticFilesTestCase(TestCase):
|
|||
# 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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue