merge r349 from branches/jython

lib/mako/pyparser.py

@@ -9,6 +9,7 @@
 Parsing to AST is done via _ast on Python > 2.5, otherwise the compiler
 module is used.
 """
+import __builtin__
 import sys
 from StringIO import StringIO
 from mako import exceptions, util
@@ -88,7 +89,7 @@ if new_ast:
         def visit_Name(self, node):
             if isinstance(node.ctx, _ast.Store):
                 self._add_declared(node.id)
-            if node.id not in __builtins__ and node.id not in self.listener.declared_identifiers and node.id not in self.local_ident_stack:
+            if node.id not in __builtin__.__dict__ and node.id not in self.listener.declared_identifiers and node.id not in self.local_ident_stack:
                 self.listener.undeclared_identifiers.add(node.id)
         def visit_Import(self, node):
             for name in node.names:
@@ -186,7 +187,7 @@ else:
             self.visit(node.assign, *args)
             self.visit(node.body, *args)
         def visitName(self, node, *args):
-            if node.name not in __builtins__ and node.name not in self.listener.declared_identifiers and node.name not in self.local_ident_stack:
+            if node.name not in __builtin__.__dict__ and node.name not in self.listener.declared_identifiers and node.name not in self.local_ident_stack:
                 self.listener.undeclared_identifiers.add(node.name)
         def visitImport(self, node, *args):
             for (mod, alias) in node.names: