mirror of https://github.com/django/django.git
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
This commit is contained in:
parent
3bff7ed34c
commit
77030ccc1e
|
@ -2,7 +2,6 @@ import urllib
|
||||||
from urlparse import urlparse
|
from urlparse import urlparse
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.exceptions import ImproperlyConfigured
|
|
||||||
from django.core.handlers.wsgi import WSGIHandler
|
from django.core.handlers.wsgi import WSGIHandler
|
||||||
|
|
||||||
from django.contrib.staticfiles import utils
|
from django.contrib.staticfiles import utils
|
||||||
|
|
|
@ -286,7 +286,7 @@ class TestServeStatic(StaticFilesTestCase):
|
||||||
|
|
||||||
class TestServeDisabled(TestServeStatic):
|
class TestServeDisabled(TestServeStatic):
|
||||||
"""
|
"""
|
||||||
Test serving media from django.contrib.admin.
|
Test serving static files disabled when DEBUG is False.
|
||||||
"""
|
"""
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestServeDisabled, self).setUp()
|
super(TestServeDisabled, self).setUp()
|
||||||
|
@ -300,7 +300,7 @@ class TestServeDisabled(TestServeStatic):
|
||||||
|
|
||||||
class TestServeStaticWithDefaultURL(TestServeStatic, TestDefaults):
|
class TestServeStaticWithDefaultURL(TestServeStatic, TestDefaults):
|
||||||
"""
|
"""
|
||||||
Test static asset serving view with staticfiles_urlpatterns helper.
|
Test static asset serving view with manually configured URLconf.
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
from django.conf import settings
|
from django.conf.urls.defaults import patterns, url
|
||||||
from django.conf.urls.defaults import *
|
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
urlpatterns = patterns('',
|
||||||
url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),
|
url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),
|
||||||
|
|
Loading…
Reference in New Issue