parsemail: Fallback to common charsets when charset is None or x-unknown

[patchwork] / apps / settings.py

diff --git a/apps/settings.py b/apps/settings.py
index 43a37d8fe539e3da9c6c6a82bdacb99de95536d4..3579ab7b06b116d510324b670870b493e0b38622 100644 (file)
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -63,14 +63,12 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
 )
 
-ROOT_URLCONF = 'apps.urls'
+ROOT_URLCONF = 'urls'
 
 LOGIN_URL = '/user/login/'
 LOGIN_REDIRECT_URL = '/user/'
 
-# If you change the ROOT_DIR setting in your local_settings.py, you'll need to
-# re-define the variables that use this (MEDIA_ROOT and TEMPLATE_DIRS) too.
-ROOT_DIR = '/srv/patchwork'
+ROOT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir)
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.