5 files changed, 5 insertions(+), 5 deletions(-)

M testproject/testproject/settings/base.py
M testproject/testproject/settings/dev.py
M testproject/testproject/urls.py
M tests/settings.py
M tests/testdata/urls.py

@@ 55,7 55,7 @@ INSTALLED_APPS = [
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'
 
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',

@@ 12,7 12,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 try:
     import debug_toolbar  # @UnusedImport
-    MIDDLEWARE_CLASSES = list(MIDDLEWARE_CLASSES) + [
+    MIDDLEWARE = list(MIDDLEWARE) + [
         'debug_toolbar.middleware.DebugToolbarMiddleware',
     ]
     INSTALLED_APPS = list(INSTALLED_APPS) + ['debug_toolbar']

@@ 10,7 10,7 @@ from wiki.urls import get_pattern as get_wiki_pattern
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
     url(r'^robots.txt', lambda _: HttpResponse('User-agent: *\nDisallow: /')),
 ]
 

@@ 37,7 37,7 @@ INSTALLED_APPS = [
     'wiki.plugins.macros.apps.MacrosConfig',
     'wiki.plugins.globalhistory.apps.GlobalHistoryConfig',
 ]
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',

@@ 9,7 9,7 @@ admin.autodiscover()
 
 urlpatterns = [
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]
 
 if settings.DEBUG: