summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-12-31 17:08:02 +0000
committerGerrit Code Review <review@openstack.org>2014-12-31 17:08:02 +0000
commit97306eda458f7f54d3eac7df0bda4165ea9fd1e7 (patch)
tree5baf59207b6b706f86bc277f955bbd541561d30a
parent1ee7db947328153e35d98bf27e1049c6c9ec1461 (diff)
parenta82e395118e09954383f915d5e463914407693cc (diff)
downloadpecan-97306eda458f7f54d3eac7df0bda4165ea9fd1e7.tar.gz
Merge "core: optimize renderer computing"
-rw-r--r--pecan/core.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/pecan/core.py b/pecan/core.py
index 173210b..af5d943 100644
--- a/pecan/core.py
+++ b/pecan/core.py
@@ -390,18 +390,19 @@ class PecanBase(object):
return args, varargs, kwargs
def render(self, template, namespace):
- renderer = self.renderers.get(
- self.default_renderer,
- self.template_path
- )
if template == 'json':
renderer = self.renderers.get('json', self.template_path)
- if ':' in template:
+ elif ':' in template:
+ renderer_name, template = template.split(':', 1)
+ renderer = self.renderers.get(
+ renderer_name,
+ self.template_path
+ )
+ else:
renderer = self.renderers.get(
- template.split(':')[0],
+ self.default_renderer,
self.template_path
)
- template = template.split(':')[1]
return renderer.render(template, namespace)
def find_controller(self, state):