From 26c777a74af1dfa6944bc2e927e7437b2b3341f7 Mon Sep 17 00:00:00 2001 From: Alessandro Molina Date: Tue, 8 Jan 2013 17:51:52 +0100 Subject: [PATCH] Refactor request_type detection usage --- tg/controllers/dispatcher.py | 1 + tg/decorators.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tg/controllers/dispatcher.py b/tg/controllers/dispatcher.py index 7d94bf8c..cf611408 100644 --- a/tg/controllers/dispatcher.py +++ b/tg/controllers/dispatcher.py @@ -65,6 +65,7 @@ def _get_dispatchable(self, url_path): state = DispatchState(pylons.request, self, params, url_path, pylons.config.get('ignore_parameters', [])) + pylons.request.response_type = None if not pylons.config.get('disable_request_extensions', False): ext = state.extension if ext is not None: diff --git a/tg/decorators.py b/tg/decorators.py index 2948b90b..1c5ca2c7 100644 --- a/tg/decorators.py +++ b/tg/decorators.py @@ -161,8 +161,8 @@ def lookup_template_engine(self, request): """ - if hasattr(request, 'response_type' - ) and request.response_type in self.engines: + response_type = getattr(request, 'response_type', None) + if response_type is not None and response_type in self.engines: accept_types = request.response_type else: accept_types = request.headers.get('accept', '*/*')