From ffb01d43ee9ddf60043e2bcc85cfddbd13433249 Mon Sep 17 00:00:00 2001 From: JaphetSamuel <40962898+JaphetSamuel@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:58:51 +0000 Subject: [PATCH 1/5] fiw middleware declaration --- django_mobile/middleware.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/django_mobile/middleware.py b/django_mobile/middleware.py index 9ce62bd..243654c 100644 --- a/django_mobile/middleware.py +++ b/django_mobile/middleware.py @@ -4,7 +4,8 @@ from django_mobile.conf import settings -class SetFlavourMiddleware(object): +#class SetFlavourMiddleware(object): +class SetFlavourMiddleware: def process_request(self, request): _init_flavour(request) @@ -18,7 +19,8 @@ def process_response(self, request, response): return response -class MobileDetectionMiddleware(object): +#class MobileDetectionMiddleware(object): +class MobileDetectionMiddleware: user_agents_test_match = ( "w3c ", "acs-", "alav", "alca", "amoi", "audi", "avan", "benq", "bird", "blac", "blaz", "brew", From 6a57da50c8ee5d11f0d57cccb54603b43d9fd0bd Mon Sep 17 00:00:00 2001 From: JaphetSamuel <40962898+JaphetSamuel@users.noreply.github.com> Date: Mon, 8 Nov 2021 23:11:04 +0000 Subject: [PATCH 2/5] middleware --- django_mobile/middleware.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/django_mobile/middleware.py b/django_mobile/middleware.py index 243654c..8f0edd8 100644 --- a/django_mobile/middleware.py +++ b/django_mobile/middleware.py @@ -2,10 +2,11 @@ from django_mobile import flavour_storage from django_mobile import set_flavour, _init_flavour from django_mobile.conf import settings +from django.utils.deprecation import MiddlewareMixin #class SetFlavourMiddleware(object): -class SetFlavourMiddleware: +class SetFlavourMiddleware(MiddlewareMixin): def process_request(self, request): _init_flavour(request) @@ -20,7 +21,7 @@ def process_response(self, request, response): #class MobileDetectionMiddleware(object): -class MobileDetectionMiddleware: +class MobileDetectionMiddleware(MiddlewareMixin): user_agents_test_match = ( "w3c ", "acs-", "alav", "alca", "amoi", "audi", "avan", "benq", "bird", "blac", "blaz", "brew", From 2ad3c3c709cde9a6c70f02da38ac2a3978078d79 Mon Sep 17 00:00:00 2001 From: JaphetSamuel <40962898+JaphetSamuel@users.noreply.github.com> Date: Mon, 8 Nov 2021 23:25:23 +0000 Subject: [PATCH 3/5] toujour dans middleware --- django_mobile/middleware.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/django_mobile/middleware.py b/django_mobile/middleware.py index 8f0edd8..e3f7464 100644 --- a/django_mobile/middleware.py +++ b/django_mobile/middleware.py @@ -6,7 +6,16 @@ #class SetFlavourMiddleware(object): -class SetFlavourMiddleware(MiddlewareMixin): +class SetFlavourMiddleware: + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + return self.get_response(request) + + def process_exception(self, request, exception): + return HttpResponse("in exception") + def process_request(self, request): _init_flavour(request) @@ -21,7 +30,14 @@ def process_response(self, request, response): #class MobileDetectionMiddleware(object): -class MobileDetectionMiddleware(MiddlewareMixin): +class MobileDetectionMiddleware: + + def __call__(self, request): + return self.get_response(request) + + def process_exception(self, request, exception): + return HttpResponse("in exception") + user_agents_test_match = ( "w3c ", "acs-", "alav", "alca", "amoi", "audi", "avan", "benq", "bird", "blac", "blaz", "brew", @@ -47,7 +63,8 @@ class MobileDetectionMiddleware(MiddlewareMixin): )) http_accept_regex = re.compile("application/vnd\.wap\.xhtml\+xml", re.IGNORECASE) - def __init__(self): + def __init__(self, get_response): + self.get_response = get_response user_agents_test_match = r'^(?:%s)' % '|'.join(self.user_agents_test_match) self.user_agents_test_match_regex = re.compile(user_agents_test_match, re.IGNORECASE) self.user_agents_test_search_regex = re.compile(self.user_agents_test_search, re.IGNORECASE) From cb1f4dce416dff9f4d2f502c3f826eb168f66b25 Mon Sep 17 00:00:00 2001 From: JaphetSamuel <40962898+JaphetSamuel@users.noreply.github.com> Date: Mon, 8 Nov 2021 23:40:43 +0000 Subject: [PATCH 4/5] fix loader --- django_mobile/loader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_mobile/loader.py b/django_mobile/loader.py index f617671..9e9f67b 100644 --- a/django_mobile/loader.py +++ b/django_mobile/loader.py @@ -14,7 +14,7 @@ class Loader(BaseLoader): def get_contents(self, origin): return origin.loader.get_contents(origin) - def get_template_sources(self, template_name, template_dirs=None): + def get_template_sources(self, template_name): template_name = self.prepare_template_name(template_name) for loader in self.template_source_loaders: if hasattr(loader, 'get_template_sources'): From 17ebc0ed01f5495c4087633336bd9cf5276de793 Mon Sep 17 00:00:00 2001 From: JaphetSamuel <40962898+JaphetSamuel@users.noreply.github.com> Date: Tue, 9 Nov 2021 00:17:17 +0000 Subject: [PATCH 5/5] loader --- django_mobile/loader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_mobile/loader.py b/django_mobile/loader.py index 9e9f67b..7483f11 100644 --- a/django_mobile/loader.py +++ b/django_mobile/loader.py @@ -19,7 +19,7 @@ def get_template_sources(self, template_name): for loader in self.template_source_loaders: if hasattr(loader, 'get_template_sources'): try: - for result in loader.get_template_sources(template_name, template_dirs): + for result in loader.get_template_sources(template_name): yield result except UnicodeDecodeError: # The template dir name was a bytestring that wasn't valid UTF-8.