summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyramid/mako_templating.py9
1 files 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):