From b6d855ea4bb490197bc801ff14896074a34aba3a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 15 Dec 2017 11:55:11 -0500 Subject: [PATCH] jinjia2 Signed-off-by: Kenneth Reitz --- Pipfile | 1 + Pipfile.lock | 23 ++++++++++++++++++----- richtext/settings.py | 5 +++-- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Pipfile b/Pipfile index f0ef2f6..082756e 100644 --- a/Pipfile +++ b/Pipfile @@ -14,6 +14,7 @@ dj-database-url = "*" whitenoise = "*" raven = "*" django-heroku = "*" +"jinja2" = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 3226400..695be34 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "7cd1f1538a3cde60f08f8d58745be89eb1b9282f142d07f74e187b699ca856e7" + "sha256": "f308c4a1b37e47e2de724eddbfdcd4dc8d83b6ac14a9487064e82cb2d9d4163f" }, "host-environment-markers": { "implementation_name": "cpython", @@ -9,12 +9,12 @@ "os_name": "posix", "platform_machine": "x86_64", "platform_python_implementation": "CPython", - "platform_release": "4.13.0-19-generic", - "platform_system": "Linux", - "platform_version": "#22-Ubuntu SMP Mon Dec 4 11:58:07 UTC 2017", + "platform_release": "17.3.0", + "platform_system": "Darwin", + "platform_version": "Darwin Kernel Version 17.3.0: Thu Nov 9 18:09:22 PST 2017; root:xnu-4570.31.3~1/RELEASE_X86_64", "python_full_version": "3.6.3", "python_version": "3.6", - "sys_platform": "linux" + "sys_platform": "darwin" }, "pipfile-spec": 6, "requires": { @@ -57,6 +57,19 @@ ], "version": "==19.7.1" }, + "jinja2": { + "hashes": [ + "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd", + "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4" + ], + "version": "==2.10" + }, + "markupsafe": { + "hashes": [ + "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665" + ], + "version": "==1.0" + }, "psycopg2": { "hashes": [ "sha256:594aa9a095de16614f703d759e10c018bdffeafce2921b8e80a0e8a0ebbc12e5", diff --git a/richtext/settings.py b/richtext/settings.py index d7b5544..a84f496 100644 --- a/richtext/settings.py +++ b/richtext/settings.py @@ -59,10 +59,11 @@ ROOT_URLCONF = 'richtext.urls' TEMPLATES = [ { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'BACKEND': 'django.template.backends.jinja2.Jinja2', 'DIRS': [], 'APP_DIRS': True, 'OPTIONS': { + 'environment': 'richtext.jinja2.environment', 'context_processors': [ 'django.template.context_processors.debug', 'django.template.context_processors.request', @@ -83,7 +84,7 @@ DATABASES = { 'default': dj_database_url.config(conn_max_age=600) } -# Keep sessions out of the DB, ew. +# Keep sessions out of the DB, ew. SESSION_ENGINE = 'django.contrib.sessions.backends.signed_cookies' # Password validation