summaryrefslogtreecommitdiff
path: root/pecan/core.py
diff options
context:
space:
mode:
Diffstat (limited to 'pecan/core.py')
-rw-r--r--pecan/core.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pecan/core.py b/pecan/core.py
index 44bad0e..eb3fe69 100644
--- a/pecan/core.py
+++ b/pecan/core.py
@@ -526,7 +526,9 @@ class PecanBase(object):
template = content_types.get(pecan_state['content_type'])
# check if for controller override of template
- template = pecan_state.get('override_template', template)
+ template = pecan_state.get('override_template', template) or (
+ 'json' if self.default_renderer == 'json' else None
+ )
pecan_state['content_type'] = pecan_state.get(
'override_content_type',
pecan_state['content_type']