Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 77030ccc1ea4e1df04540e4d4594cb0d741fa2b4 1 parent 3bff7ed
Carl Meyer carljm authored
1  django/contrib/staticfiles/handlers.py
View
@@ -2,7 +2,6 @@
from urlparse import urlparse
from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
from django.core.handlers.wsgi import WSGIHandler
from django.contrib.staticfiles import utils
4 tests/regressiontests/staticfiles_tests/tests.py
View
@@ -286,7 +286,7 @@ def assertFileNotFound(self, filepath):
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 @@ def test_disabled_serving(self):
class TestServeStaticWithDefaultURL(TestServeStatic, TestDefaults):
"""
- Test static asset serving view with staticfiles_urlpatterns helper.
+ Test static asset serving view with manually configured URLconf.
"""
pass
3  tests/regressiontests/staticfiles_tests/urls/default.py
View
@@ -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'),
Please sign in to comment.
Something went wrong with that request. Please try again.