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

template/base.py

@@ -254 +254 @@
         """Pop the top-most scope from the stack."""
 
 
+# check for a python 2.4 bug in the ceval loop.
+try:
+    exec 'from sys import *' in {}, Context()
+except SystemError:
+    def _star_import_compat(self, module):
+        namespace = self.frames[0]
+        mod = __import__(module, None, None, ['__all__'])
+        if hasattr(mod, '__all__'):
+            members = mod.__all__
+        else:
+            members = [x for x in mod.__dict__.items()
+                       if not x.startswith('_')]
+        for member in members:
+            namespace[member] = getattr(mod, member)
+    Context._star_import_compat = _star_import_compat
+    del _star_import_compat
+
+
 def _apply_directives(stream, directives, ctxt, **vars):
     """Apply the given directives to the stream.
     

template/eval.py

@@ -26 +26 @@
 from textwrap import dedent
 
 from genshi.core import Markup
-from genshi.template.base import TemplateRuntimeError
+from genshi.template.base import TemplateRuntimeError, Context
 from genshi.util import flatten
 
 __all__ = ['Code', 'Expression', 'Suite', 'LenientLookup', 'StrictLookup',
@@ -520 +520 @@
             [self.visit(x) for x in node.subs]
         )
 
+    def visitFrom(self, node):
+        if not hasattr(Context, '_star_import_compat') 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.Getattr(ast.Name('__data__'), '_star_import_compat'),
+            [ast.Const(node.modname)], None, None
+        ), lineno=node.lineno)
+
     # Statements
 
     def visitAssert(self, node):