Ticket #221: genshi-py24-star-import-3.patch

genshi/template/base.py

@@ -244 +244 @@
         """
         return [(key, self.get(key)) for key in self.keys()]
 
+    def update(self, mapping):
+        """Update the context from the mapping provided."""
+        self.frames[0].update(mapping)
+
     def push(self, data):
         """Push a new scope on the stack.
         

genshi/template/eval.py

@@ -34 +34 @@
 __docformat__ = 'restructuredtext en'
 
 
+# check for a python 2.4 bug in the ceval loop.
+try:
+    class _FakeMapping(object):
+        __getitem__ = __setitem__ = lambda *a: None
+    exec 'from sys import *' in {}, _FakeMapping()
+except SystemError:
+    has_star_import_bug = True
+else:
+    has_star_import_bug = False
+del _FakeMapping
+
+
+def _star_import_compat(namespace, module):
+    """This function is used as helper callback if a Python version
+    with a broken star-import opcode is in use.
+
+    :see: has_star_import_bug
+    """
+    mod = __import__(module, None, None, ['__all__'])
+    if hasattr(mod, '__all__'):
+        members = mod.__all__
+    else:
+        members = (x for x in mod.__dict__ if not x.startswith('_'))
+    namespace.update((m, getattr(mod, m)) for m in members)
+
+
 class Code(object):
     """Abstract base class for the `Expression` and `Suite` classes."""
     __slots__ = ['source', 'code', 'ast', '_globals']
@@ -270 +296 @@
             '_lookup_name': cls.lookup_name,
             '_lookup_attr': cls.lookup_attr,
             '_lookup_item': cls.lookup_item,
+            '_star_import_compat': _star_import_compat,
             'UndefinedError': UndefinedError,
         }
     globals = classmethod(globals)
@@ -520 +547 @@
             [self.visit(x) for x in node.subs]
         )
 
+    def visitFrom(self, node):
+        if not has_star_import_bug or node.names != [('*', None)]:
+            return node
+        # this is a python 2.x bug.  Only if we have a broken python
+        # version we have to apply that hack.
+        return ast.Discard(ast.CallFunc(
+            ast.Name('_star_import_compat'),
+            [ast.Name('__data__'), ast.Const(node.modname)], None, None
+        ), lineno=node.lineno)
+
     # Statements
 
     def visitAssert(self, node):