# HG changeset patch
# User cmlenz
# Date 1149417974 0
# Node ID 5da45906dda7e60720c3c76ff183ddfd00a4e601
# Parent  1add946decb88dd1c426d911dc8b0b582890884c
Simplified implementation of `py:content` directive.

diff --git a/examples/turbogears/markuptest/templates/master.html b/examples/turbogears/markuptest/templates/master.html
--- a/examples/turbogears/markuptest/templates/master.html
+++ b/examples/turbogears/markuptest/templates/master.html
@@ -32,7 +32,7 @@
 
     <div py:if="tg_flash" class="flash" py:content="tg_flash"></div>
 
-    ${select('*')}
+    ${select('*/*')}
 
     <p align="center"><img src="/static/images/tg_under_the_hood.png" alt="TurboGears under the hood"/></p>
 </body>
diff --git a/markup/core.py b/markup/core.py
--- a/markup/core.py
+++ b/markup/core.py
@@ -246,7 +246,9 @@
                             .replace('&amp;', '&')
 
     def plaintext(self, keeplinebreaks=True):
-        """Returns the text as a `unicode`with all entities and tags removed."""
+        """Returns the text as a `unicode` string with all entities and tags
+        removed.
+        """
         text = unicode(self.striptags().stripentities())
         if not keeplinebreaks:
             text = text.replace('\n', ' ')
diff --git a/markup/template.py b/markup/template.py
--- a/markup/template.py
+++ b/markup/template.py
@@ -242,11 +242,10 @@
         if kind is Stream.START:
             yield kind, data, pos # emit start tag
         yield Stream.EXPR, self.expr, pos
-        previous = None
-        try:
-            while True:
-                previous = stream.next()
-        except StopIteration:
+        previous = stream.next()
+        for event in stream:
+            previous = event
+        else:
             if previous is not None:
                 yield previous