Django 1.6 and some cleaning.

[wolnelektury.git] / apps / waiter / settings.py

diff --git a/apps/waiter/settings.py b/apps/waiter/settings.py
index fef4a7e..aaa9f03 100644 (file)
--- a/apps/waiter/settings.py
+++ b/apps/waiter/settings.py
@@ -1,10 +1,14 @@
-from os.path import join
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from os.path import abspath, join

 from django.conf import settings
 
 try:
 from django.conf import settings
 
 try:

-    WAITER_ROOT = settings.WAITER_ROOT
+    WAITER_ROOT = abspath(settings.WAITER_ROOT)

 except AttributeError:
 except AttributeError:

-    WAITER_ROOT = join(settings.MEDIA_ROOT, 'waiter')
+    WAITER_ROOT = abspath(join(settings.MEDIA_ROOT, 'waiter'))

 
 try:
     WAITER_URL = settings.WAITER_URL
 
 try:
     WAITER_URL = settings.WAITER_URL