diff --git a/lib/mako/codegen.py b/lib/mako/codegen.py index 7d659bb534c30ded78550b9cfbac116f2a880719..96a0a03d048d210c6f02073b6688807bd791e860 100644 --- a/lib/mako/codegen.py +++ b/lib/mako/codegen.py @@ -144,7 +144,7 @@ class _GenerateRenderMethod(object): self.identifier_stack[-1].argument_declared.add('pageargs') if not self.in_def and (len(self.identifiers.locally_assigned) > 0 or len(self.identifiers.argument_declared)>0): - self.printer.writeline("__locals = dict(%s)" % ','.join("%s=%s" % (x, x) for x in self.identifiers.argument_declared)) + self.printer.writeline("__locals = dict(%s)" % ','.join(["%s=%s" % (x, x) for x in self.identifiers.argument_declared])) self.write_variable_declares(self.identifiers, toplevel=True) @@ -589,4 +589,4 @@ class _Identifiers(object): for ident in node.undeclared_identifiers(): if ident != 'context' and ident not in self.declared.union(self.locally_declared): self.undeclared.add(ident) - \ No newline at end of file + diff --git a/lib/mako/parsetree.py b/lib/mako/parsetree.py index fd4741d0c2d01f11b7a3a117873a9a992866e151..33bcfe583cca3134716b6e2cb4dbdfee3848e4c6 100644 --- a/lib/mako/parsetree.py +++ b/lib/mako/parsetree.py @@ -225,7 +225,7 @@ class NamespaceTag(Tag): __keyword__ = 'namespace' def __init__(self, keyword, attributes, **kwargs): super(NamespaceTag, self).__init__(keyword, attributes, (), ('name','inheritable','file','import'), (), **kwargs) - self.name = attributes.get('name', '__anon_%s' % hex(id(self))) + self.name = attributes.get('name', '__anon_%s' % hex(abs(id(self)))) if not 'name' in attributes and not 'import' in attributes: raise exceptions.CompileException("'name' and/or 'import' attributes are required for <%namespace>", self.lineno, self.pos, self.filename) def declared_identifiers(self): @@ -279,4 +279,4 @@ class PageTag(Tag): def declared_identifiers(self): return self.body_decl.argnames - \ No newline at end of file +