From e36240dfacb5dead3e5eb717ecaccd25b142503f Mon Sep 17 00:00:00 2001 From: Amyth Date: Mon, 23 Jan 2017 17:03:23 +0530 Subject: [PATCH 1/4] fix TEMPLATE_LOADERS attribute error for Django > 1.8 --- django_mobile/conf.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/django_mobile/conf.py b/django_mobile/conf.py index 3ffc804..4dc4445 100644 --- a/django_mobile/conf.py +++ b/django_mobile/conf.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from django import VERSION as django_version from django.conf import settings as django_settings CACHE_LOADER_NAME = 'django_mobile.loader.CachedLoader' @@ -30,7 +31,17 @@ class defaults(object): FLAVOURS_COOKIE_HTTPONLY = False FLAVOURS_SESSION_KEY = u'flavour' FLAVOURS_TEMPLATE_LOADERS = [] - for loader in django_settings.TEMPLATE_LOADERS: + + if django_version >= 1.8: + loaders = [] + for template_engine in django_settings.TEMPLATES: + loaders += template_engine.get('OPTIONS', {}).get('loaders', []) + DEFAULT_TEMPLATE_LOADERS = loaders + pass + else: + DEFAULT_TEMPLATE_LOADERS = django_settings.TEMPLATE_LOADERS + + for loader in django_settings.DEFAULT_TEMPLATE_LOADERS: if isinstance(loader, (tuple, list)) and loader[0] == CACHE_LOADER_NAME: for cached_loader in loader[1]: if cached_loader != DJANGO_MOBILE_LOADER: From d681446239fb94e2a17b758cb071f8d98cc82745 Mon Sep 17 00:00:00 2001 From: Amyth Date: Mon, 23 Jan 2017 17:06:59 +0530 Subject: [PATCH 2/4] Fix a minor bug --- django_mobile/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_mobile/conf.py b/django_mobile/conf.py index 4dc4445..c83e0f3 100644 --- a/django_mobile/conf.py +++ b/django_mobile/conf.py @@ -41,7 +41,7 @@ class defaults(object): else: DEFAULT_TEMPLATE_LOADERS = django_settings.TEMPLATE_LOADERS - for loader in django_settings.DEFAULT_TEMPLATE_LOADERS: + for loader in DEFAULT_TEMPLATE_LOADERS: if isinstance(loader, (tuple, list)) and loader[0] == CACHE_LOADER_NAME: for cached_loader in loader[1]: if cached_loader != DJANGO_MOBILE_LOADER: From 49414f1324ce4d16d2a2a49ffeb4196bd48d81e5 Mon Sep 17 00:00:00 2001 From: Amyth Date: Thu, 2 Feb 2017 15:54:12 +0530 Subject: [PATCH 3/4] remove unwanted pass statement --- django_mobile/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/django_mobile/conf.py b/django_mobile/conf.py index c83e0f3..de7346b 100644 --- a/django_mobile/conf.py +++ b/django_mobile/conf.py @@ -37,7 +37,6 @@ class defaults(object): for template_engine in django_settings.TEMPLATES: loaders += template_engine.get('OPTIONS', {}).get('loaders', []) DEFAULT_TEMPLATE_LOADERS = loaders - pass else: DEFAULT_TEMPLATE_LOADERS = django_settings.TEMPLATE_LOADERS From 3d1335a08e4f67de2599653d6e91d14d620a6b75 Mon Sep 17 00:00:00 2001 From: Amyth Date: Mon, 13 Feb 2017 11:43:30 +0530 Subject: [PATCH 4/4] Fix python3 gte issue --- django_mobile/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_mobile/conf.py b/django_mobile/conf.py index de7346b..1080f44 100644 --- a/django_mobile/conf.py +++ b/django_mobile/conf.py @@ -32,7 +32,7 @@ class defaults(object): FLAVOURS_SESSION_KEY = u'flavour' FLAVOURS_TEMPLATE_LOADERS = [] - if django_version >= 1.8: + if django_version >= (1, 8): loaders = [] for template_engine in django_settings.TEMPLATES: loaders += template_engine.get('OPTIONS', {}).get('loaders', [])