diff options
| author | Blaise Laflamme <blaise@laflamme.org> | 2013-08-13 23:24:59 -0400 |
|---|---|---|
| committer | Blaise Laflamme <blaise@laflamme.org> | 2013-08-13 23:24:59 -0400 |
| commit | 4c6754fee3114b9d6baca135e75fbd51169c5cf9 (patch) | |
| tree | ecb882a59f5a1da11b0b1d9d9fb10a97f2c29535 | |
| parent | 6a227f73e7dedb0bc551242a44a86bf03f4e6f42 (diff) | |
| download | pyramid-4c6754fee3114b9d6baca135e75fbd51169c5cf9.tar.gz pyramid-4c6754fee3114b9d6baca135e75fbd51169c5cf9.tar.bz2 pyramid-4c6754fee3114b9d6baca135e75fbd51169c5cf9.zip | |
fixed mako renderer returning a tuple with a previous defname value in some circumstances
| -rw-r--r-- | pyramid/mako_templating.py | 9 |
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): |