Initial port to django-1.7

[sommitrealweird.git] / sommitrealweird / settings.py

diff --git a/sommitrealweird/settings.py b/sommitrealweird/settings.py
index 95ead0af9503abad2d07062952eb71ac66b1076c..497cad1c73e48ba2d872a9e8eb33c7919a04cd83 100644 (file)
--- a/sommitrealweird/settings.py
+++ b/sommitrealweird/settings.py
@@ -26,6 +26,8 @@ LANGUAGE_CODE = 'en-gb'
 
 SITE_ID = 1
 
+TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
@@ -58,7 +60,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
 )
 
 ROOT_URLCONF = 'urls'
@@ -73,7 +75,6 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
-    'django.contrib.markup',
     'django.contrib.comments',
     'bpcms',
     'generic',