diff options
| author | Carl Meyer <carl@oddbird.net> | 2011-02-01 20:39:40 +0000 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2011-02-01 20:39:40 +0000 |
| commit | 77030ccc1ea4e1df04540e4d4594cb0d741fa2b4 (patch) | |
| tree | add8d01e55ad75ceacf91c842167539d3b6c2493 /tests/regressiontests | |
| parent | 3bff7ed34c0bf29a0fada05cfaf729aaec7cea6d (diff) | |
Fixed a few test docstrings and removed an unused import in staticfiles.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
| -rw-r--r-- | tests/regressiontests/staticfiles_tests/tests.py | 4 | ||||
| -rw-r--r-- | tests/regressiontests/staticfiles_tests/urls/default.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/regressiontests/staticfiles_tests/tests.py index 1fb043c715..d524254f3c 100644 --- a/tests/regressiontests/staticfiles_tests/tests.py +++ b/tests/regressiontests/staticfiles_tests/tests.py @@ -286,7 +286,7 @@ class TestServeStatic(StaticFilesTestCase): class TestServeDisabled(TestServeStatic): """ - Test serving media from django.contrib.admin. + Test serving static files disabled when DEBUG is False. """ def setUp(self): super(TestServeDisabled, self).setUp() @@ -300,7 +300,7 @@ class TestServeDisabled(TestServeStatic): class TestServeStaticWithDefaultURL(TestServeStatic, TestDefaults): """ - Test static asset serving view with staticfiles_urlpatterns helper. + Test static asset serving view with manually configured URLconf. """ pass diff --git a/tests/regressiontests/staticfiles_tests/urls/default.py b/tests/regressiontests/staticfiles_tests/urls/default.py index 061ec6465e..5788268175 100644 --- a/tests/regressiontests/staticfiles_tests/urls/default.py +++ b/tests/regressiontests/staticfiles_tests/urls/default.py @@ -1,5 +1,4 @@ -from django.conf import settings -from django.conf.urls.defaults import * +from django.conf.urls.defaults import patterns, url urlpatterns = patterns('', url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'), |