aboutsummaryrefslogtreecommitdiffstats
path: root/django_skaschool
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-04-22 13:14:50 +0800
committerWeitian LI <liweitianux@gmail.com>2014-04-22 13:14:50 +0800
commit56ef9383b2a02239e6466e3c3d665f9d0aed2426 (patch)
tree6c4fb569b00abb35c250cb62a5406c07db4f2557 /django_skaschool
parentb35eca8c38f89af8b30035a973f1edfba416eff6 (diff)
downloaddjango-skaschool-56ef9383b2a02239e6466e3c3d665f9d0aed2426.tar.bz2
modified settings_email import to make it required
Diffstat (limited to 'django_skaschool')
-rw-r--r--django_skaschool/settings.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/django_skaschool/settings.py b/django_skaschool/settings.py
index 6297455..7bb21b3 100644
--- a/django_skaschool/settings.py
+++ b/django_skaschool/settings.py
@@ -144,10 +144,7 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media_root')
MEDIA_URL = '/media/'
## email settings
-try:
- from settings_email import *
-except ImportError:
- pass
+from settings_email import *
#################################################