Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 authored February 01, 2011
1  django/contrib/staticfiles/handlers.py
@@ -2,7 +2,6 @@
2 2
 from urlparse import urlparse
3 3
 
4 4
 from django.conf import settings
5  
-from django.core.exceptions import ImproperlyConfigured
6 5
 from django.core.handlers.wsgi import WSGIHandler
7 6
 
8 7
 from django.contrib.staticfiles import utils
4  tests/regressiontests/staticfiles_tests/tests.py
@@ -286,7 +286,7 @@ def assertFileNotFound(self, filepath):
286 286
 
287 287
 class TestServeDisabled(TestServeStatic):
288 288
     """
289  
-    Test serving media from django.contrib.admin.
  289
+    Test serving static files disabled when DEBUG is False.
290 290
     """
291 291
     def setUp(self):
292 292
         super(TestServeDisabled, self).setUp()
@@ -300,7 +300,7 @@ def test_disabled_serving(self):
300 300
 
301 301
 class TestServeStaticWithDefaultURL(TestServeStatic, TestDefaults):
302 302
     """
303  
-    Test static asset serving view with staticfiles_urlpatterns helper.
  303
+    Test static asset serving view with manually configured URLconf.
304 304
     """
305 305
     pass
306 306
 
3  tests/regressiontests/staticfiles_tests/urls/default.py
... ...
@@ -1,5 +1,4 @@
1  
-from django.conf import settings
2  
-from django.conf.urls.defaults import *
  1
+from django.conf.urls.defaults import patterns, url
3 2
 
4 3
 urlpatterns = patterns('',
5 4
     url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),

0 notes on commit 77030cc

Please sign in to comment.
Something went wrong with that request. Please try again.