Attachment 589405 Details for Bug 828657 – less redundant TEMPLATE_LOADERS fix

[patch] less redundant TEMPLATE_LOADERS fix

cobbler-web_settings-py_loader_fix.diff (text/plain), 2.10 KB, created by Pete Travis on 2012-06-05 07:06:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Travis

Created: 2012-06-05 07:06:11 UTC

Size: 2.10 KB

patch

obsolete

>From 9c5e3c9e7f704136d4366059092b919cf1737f90 Mon Sep 17 00:00:00 2001
>From: Pete Travis <me@petetravis.com>
>Date: Tue, 5 Jun 2012 00:45:17 -0600
>Subject: [PATCH 1/2] moving TEMPLATE_LOADERS clause into django version check
> e enter the commit message for your changes. Lines
> starting
>
>---
> web/settings.py |   11 +++++++++++
> 1 file changed, 11 insertions(+)
>
>diff --git a/web/settings.py b/web/settings.py
>index b1fbaf3..bb44949 100644
>--- a/web/settings.py
>+++ b/web/settings.py
>@@ -51,6 +51,12 @@ if django.VERSION[0] == 1 and django.VERSION[1] < 2:
>         'django.contrib.sessions.middleware.SessionMiddleware',
>         'django.contrib.auth.middleware.AuthenticationMiddleware',
>     )
>+
>+    TEMPLATE_LOADERS = (
>+    'django.template.loaders.filesystem.load_template_source',
>+    'django.template.loaders.app_directories.load_template_source',
>+    )
>+
> else:
>     MIDDLEWARE_CLASSES = (
>         'django.middleware.common.CommonMiddleware',
>@@ -58,6 +64,11 @@ else:
>         'django.contrib.sessions.middleware.SessionMiddleware',
>         'django.contrib.auth.middleware.AuthenticationMiddleware',
>     )
>+    TEMPLATE_LOADERS = (
>+    'django.template.loaders.filesystem.Loader',
>+    'django.template.loaders.app_directories.Loader',
>+    #     'django.template.loaders.eggs.Loader',
>+    )
> 
> ROOT_URLCONF = 'urls'
> 
>-- 
>1.7.10.2
>
>
>From 49cb8bd75b09f8d47e9b79115dd3bce94159b021 Mon Sep 17 00:00:00 2001
>From: Pete Travis <me@petetravis.com>
>Date: Tue, 5 Jun 2012 01:03:24 -0600
>Subject: [PATCH 2/2] fixing TEMPLATE_LOADERS better
>
>---
> web/settings.py |    5 -----
> 1 file changed, 5 deletions(-)
>
>diff --git a/web/settings.py b/web/settings.py
>index bb44949..f4fb70e 100644
>--- a/web/settings.py
>+++ b/web/settings.py
>@@ -36,11 +36,6 @@ SECRET_KEY = ''
> 
> # code config
> 
>-TEMPLATE_LOADERS = (
>-    'django.template.loaders.filesystem.load_template_source',
>-    'django.template.loaders.app_directories.load_template_source',
>-)
>-
> if django.VERSION[0] == 1 and django.VERSION[1] < 2:
>     # Legacy django had a different CSRF method, which also had 
>     # different middleware. We check the vesion here so we bring in 
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 828657: 589401 | 589405