Upgrading PyHAML since @mikeboers was kind enough to fix those few bugs I reported. Thanks!

Author: al-the-x

packages/haml/backwards.py

@@ -0,0 +1,26 @@
+
+# For compatibility with 2.5
+# Lifted from http://stackoverflow.com/questions/1716428/def-next-for-python-pre-2-6-instead-of-object-next-method/1716464#1716464
+
+class Throw(object): pass
+throw = Throw() # easy sentinel hack
+
+def next(iterator, default=throw):
+    """next(iterator[, default])
+
+    Return the next item from the iterator. If default is given
+    and the iterator is exhausted, it is returned instead of
+    raising StopIteration.
+    """
+    try:
+        iternext = iterator.next.__call__
+        # this way an AttributeError while executing next() isn't hidden
+        # (2.6 does this too)
+    except AttributeError:
+        raise TypeError("%s object is not an iterator" % type(iterator).__name__)
+    try:
+        return iternext()
+    except StopIteration:
+        if default is throw:
+            raise
+        return default

packages/haml/codegen.py

@@ -120,13 +120,16 @@ def start_document(self):
         )
 
 
+
 def flatten_attr_list(input):
     if not input:
         return
     if isinstance(input, basestring):
         yield input
         return
-    if not isinstance(input, collections.Iterable):
+    try:
+        input = iter(input)
+    except TypeError:
         yield input
         return
     for element in input:

packages/haml/nodes.py

@@ -65,7 +65,7 @@ def print_tree(self, _depth=0, _inline=False):
 
 
 class GreedyBase(Base):
-
+    
     def __init__(self, *args, **kwargs):
         super(GreedyBase, self).__init__(*args, **kwargs)
         self._greedy_parent = None
@@ -123,6 +123,10 @@ def __repr__(self):
         return '%s(%r)' % (self.__class__.__name__, self.content)
 
 
+
+class GreedyContent(Content, GreedyBase):
+    pass
+
 class Expression(Content, GreedyBase):
 
     def __init__(self, content, filters=''):
@@ -142,7 +146,6 @@ def __repr__(self):
 
 
 
-
 class Tag(Base):
 
     self_closing_names = set('''

packages/haml/parse.py

@@ -1,4 +1,8 @@
 
+try:
+    next
+except NameError:
+    from .backwards import next
 import re
 
 from . import nodes
@@ -51,33 +55,41 @@ def parse(self, source):
 
             line = raw_line.lstrip()
 
-            # We track the inter-line depth seperate from the intra-line depth
-            # so that indentation due to whitespace always results in more
-            # depth in the graph than many nested nodes from a single line.
-            # We treat a whitespace-only line as if the indentation level has
-            # not changed
-            inter_depth = len(raw_line) - len(line)
-            intra_depth = 0
-            
-            # Cleanup the stack. We should only need to do this here as the
-            # depth only goes up until it is calculated from the next line.
-            self._prep_stack_for_depth((inter_depth, intra_depth))
-            
+            if line:
+                
+                # We track the inter-line depth seperate from the intra-line depth
+                # so that indentation due to whitespace always results in more
+                # depth in the graph than many nested nodes from a single line.
+                inter_depth = len(raw_line) - len(line)
+                intra_depth = 0
+                
+                # Cleanup the stack. We should only need to do this here as the
+                # depth only goes up until it is calculated from the next line.
+                self._prep_stack_for_depth((inter_depth, intra_depth))
+                
+            else:
+                
+                # Pretend that a blank line is at the same depth as the
+                # previous.
+                inter_depth, intra_depth = self._stack[-1][0]
+                    
             # Greedy nodes recieve all content until we fall out of their scope.
             if isinstance(self._topmost_node, nodes.GreedyBase):
+                topmost = self._topmost_node
+                # Blank lines go at the same level as the previous if it is
+                # not the parent greedy node.
+                if not line and topmost is not topmost.outermost_node:
+                    self._stack.pop()
                 self._add_node(
-                    self._topmost_node.__class__.with_parent(self._topmost_node, line),
+                    topmost.with_parent(topmost, line),
                     (inter_depth, intra_depth)
                 )
                 continue
 
+            # Discard all empty lines that are not in a greedy context.
             if not line:
-                # I am unsure if I should just be discarding all empty lines
-                # like this. There are some scenarios in which an empty line
-                # would still be used, such as in a multiline string inside a
-                # source block.
                 continue
-
+            
             # Main loop. We process a series of tokens, which consist of either
             # nodes to add to the stack, or strings to be re-parsed and
             # attached as inline.
@@ -143,7 +155,7 @@ def _parse_line(self, line):
 
         # Tags.
         m = re.match(r'''
-            (?:%(%?\w*))?             # tag name. the extra % is for mako
+            (?:%(%?(?:\w+:)?\w*))?             # tag name. the extra % is for mako
             (?:
               \[(.+?)(?:,(.+?))?\]    # object reference and prefix
             )?