Commits

Mikhail Korobov committed acacc8b Merge

merge

Comments (0)

Files changed (1)

django_webtest/__init__.py

 from django.contrib.auth.models import User
 from django.test.signals import template_rendered
 from django.core.handlers.wsgi import WSGIHandler
-from django.core.servers.basehttp import AdminMediaHandler
 from django.test import TestCase
 from django.test.client import store_rendered_templates
 from django.utils.functional import curry
 from django_webtest.middleware import DjangoWsgiFix
 from django_webtest.response import DjangoWebtestResponse
 
+try:
+    from django.core.servers.basehttp import AdminMediaHandler as StaticFilesHandler
+except ImportError:
+    from django.contrib.staticfiles.handlers import StaticFilesHandler
+
 
 class DjangoTestApp(TestApp):
 
         super(DjangoTestApp, self).__init__(self.get_wsgi_handler(), extra_environ, relative_to)
 
     def get_wsgi_handler(self):
-        return DjangoWsgiFix(AdminMediaHandler(WSGIHandler()))
+        return DjangoWsgiFix(StaticFilesHandler(WSGIHandler()))
 
     def _update_environ(self, environ, user):
         if user:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.