fixed mako renderer returning a tuple with a previous defname value in some...

Blaise Laflamme

2013-08-14 f2437c3f90637b37d8803cb9714b513b15f176c6

fixed mako renderer returning a tuple with a previous defname value in some circumstances

 pyramid/mako_templating.py

@@ -215,12 +215,9 @@
        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):