From ec2abf402b1fc62e99f956a838a4fa4ffcc3a1bb Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 16 Dec 2006 23:04:01 +0000
Subject: [PATCH] py2.3 tweaks
---
lib/mako/codegen.py | 4 ++--
lib/mako/parsetree.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/mako/codegen.py b/lib/mako/codegen.py
index 7d659bb..96a0a03 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 fd4741d..33bcfe5 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
+
--
GitLab