From 4c6754fee3114b9d6baca135e75fbd51169c5cf9 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Tue, 13 Aug 2013 23:24:59 -0400 Subject: fixed mako renderer returning a tuple with a previous defname value in some circumstances --- pyramid/mako_templating.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pyramid/mako_templating.py b/pyramid/mako_templating.py index 8d4583d82..fa45b671c 100644 --- a/pyramid/mako_templating.py +++ b/pyramid/mako_templating.py @@ -215,12 +215,9 @@ class MakoLookupTemplateRenderer(object): context = system.pop('context', None) if context is not None: system['_context'] = context - if self.defname is None: - if isinstance(value, tuple): - self.defname, value = value - else: - if isinstance(value, tuple): - _, value = value + # tuple returned to be deprecated + if isinstance(value, tuple): + self.defname, value = value try: system.update(value) except (TypeError, ValueError): -- cgit v1.2.3