More Py3 compatibility fixes.

[wolnelektury.git] / src / wolnelektury / settings / __init__.py

diff --git a/src/wolnelektury/settings/__init__.py b/src/wolnelektury/settings/__init__.py
index 7c1dd29..78b556d 100644 (file)
--- a/src/wolnelektury/settings/__init__.py
+++ b/src/wolnelektury/settings/__init__.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # Django settings for wolnelektury project.
 # -*- coding: utf-8 -*-
 # Django settings for wolnelektury project.

+from .apps import *

 from .basic import *
 from .auth import *
 from .cache import *
 from .basic import *
 from .auth import *
 from .cache import *


@@ -10,96 +11,6 @@ from .locale import *
 from .static import *
 from .paths import *
 
 from .static import *
 from .paths import *
 

-
-MIDDLEWARE_CLASSES = [
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'ssify.middleware.SsiMiddleware',
-    'django.middleware.cache.UpdateCacheMiddleware',
-    'ssify.middleware.PrepareForCacheMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.admindocs.middleware.XViewMiddleware',
-    'pagination.middleware.PaginationMiddleware',
-    'ssify.middleware.LocaleMiddleware',
-    'maintenancemode.middleware.MaintenanceModeMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
-    'django.middleware.cache.FetchFromCacheMiddleware',
-]
-
-ROOT_URLCONF = 'wolnelektury.urls'
-
-# These are the ones we should test.
-INSTALLED_APPS_OUR = [
-    'wolnelektury',
-    # our
-    'ajaxable',
-    'api',
-    'catalogue',
-    'chunks',
-    'dictionary',
-    'infopages',
-    'lesmianator',
-    'newtagging',
-    'opds',
-    'pdcounter',
-    'reporting',
-    'sponsors',
-    'stats',
-    'suggest',
-    'picture',
-    'social',
-    'waiter',
-    'search',
-    'oai',
-    'funding',
-    'polls',
-    'libraries',
-    ]
-
-GETPAID_BACKENDS = (
-    'getpaid.backends.payu',
-)
-
-INSTALLED_APPS_CONTRIB = [
-    # Should be before django.contrib.admin
-    'modeltranslation',
-
-    # external
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'django.contrib.admindocs',
-    'django.contrib.staticfiles',
-    'pagination',
-    'pipeline',
-    'piston',
-    'piwik',
-    'sorl.thumbnail',
-    'kombu.transport.django',
-    'honeypot',
-    'fnpdjango',
-    'getpaid',
-    'getpaid.backends.payu',
-    'ssify',
-    'django_extensions',
-
-    # allauth stuff
-    'uni_form',
-    'allauth',
-    'allauth.account',
-    'allauth.socialaccount',
-    'allauth.socialaccount.providers.openid',
-    'allauth.socialaccount.providers.facebook',
-    # 'allauth.socialaccount.providers.twitter',
-    ]
-
-INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB
-

 # Load localsettings, if they exist
 try:
     from wolnelektury.localsettings import *
 # Load localsettings, if they exist
 try:
     from wolnelektury.localsettings import *