From 463c4d147cd2a8ad934bfa60172f6ee54906887b Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 31 Mar 2016 15:14:54 +0100 Subject: [PATCH] Update settings for django10 support Allow env.EMAIL_PORT to be None without error Change template context preprocessor in favour of the new syntax. --- PyRIGS/settings.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 13ca4874..f8747618 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -158,7 +158,7 @@ EMAILER_TEST = False if not DEBUG or EMAILER_TEST: EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_HOST = os.environ.get('EMAIL_HOST') - EMAIL_PORT = int(os.environ.get('EMAIL_PORT')) + EMAIL_PORT = int(os.environ.get('EMAIL_PORT', 25)) EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER') EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD') EMAIL_USE_TLS = bool(int(os.environ.get('EMAIL_USE_TLS', 0))) @@ -203,12 +203,12 @@ TEMPLATES = [ 'OPTIONS': { 'context_processors': [ "django.contrib.auth.context_processors.auth", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.media", - "django.core.context_processors.static", - "django.core.context_processors.tz", - "django.core.context_processors.request", + "django.template.context_processors.debug", + "django.template.context_processors.i18n", + "django.template.context_processors.media", + "django.template.context_processors.static", + "django.template.context_processors.tz", + "django.template.context_processors.request", "django.contrib.messages.context_processors.messages", ] },