Ticket #290: genshi-290.diff

genshi/filters/tests/transform.py

@@ -522 +522 @@
             self._filter('.', 'foo'),
             [[(None, TEXT, u'foo')]])
 
+    def test_filter_after_outside(self):
+        stream = _transform(
+            '<root>x</root>', Transformer('//root/text()').filter(lambda x: x))
+        self.assertEqual(
+            list(stream),
+            [(None, START, u'root'),
+             (OUTSIDE, TEXT, u'x'),
+             (None, END, u'root')])
 
+
 class MapTest(unittest.TestCase):
     def _map(self, select, kind=None):
         data = []

genshi/filters/transform.py

@@ -912 +912 @@
                 for queue_event in flush(queue):
                     yield queue_event
             elif mark is OUTSIDE:
-                stopped = True
+                stopped = False
                 queue.append(event)
                 for mark, event in stream:
                     if mark is not OUTSIDE:
@@ -923 +923 @@
                 for queue_event in flush(queue):
                     yield queue_event
                 if not stopped:
-                    yield None, event
+                    yield mark, event
             else:
                 yield mark, event
         for queue_event in flush(queue):