more cleanup in aisle block.

Author: ikirudennis

tests/test_block.py

@@ -13,25 +13,24 @@ def test_block():
 
     result = t.fBlock("bq", "", None, "", "Hello BlockQuote")
     expect = ('blockquote', OrderedDict(), 'p', OrderedDict(),
-            'Hello BlockQuote', False)
+            'Hello BlockQuote')
     assert result == expect
 
     result = t.fBlock("bq", "", None, "http://google.com", "Hello BlockQuote")
     citation = '{0}1:url'.format(t.uid)
     expect = ('blockquote', OrderedDict([('cite',
         '{0.uid}{0.refIndex}:url'.format(t))]), 'p', OrderedDict(),
-        'Hello BlockQuote', False)
+        'Hello BlockQuote')
     assert result == expect
 
     result = t.fBlock("bc", "", None, "", 'printf "Hello, World";')
     # the content of text will be turned shelved, so we'll asert only the
     # deterministic portions of the expected values, below
-    expect = ('pre', OrderedDict(), 'code', OrderedDict(), 'shelve', False)
+    expect = ('pre', OrderedDict(), 'code', OrderedDict(), 'shelve')
     assert result[0:3] == expect[0:3]
-    assert result[-1] == expect[-1]
 
     result = t.fBlock("h1", "", None, "", "foobar")
-    expect = ('h1', OrderedDict(), '', OrderedDict(), 'foobar', False)
+    expect = ('h1', OrderedDict(), '', OrderedDict(), 'foobar')
     assert result == expect
 
 def test_block_tags_false():

textile/core.py

@@ -577,8 +577,8 @@ def block(self, text):
             # tag specified on this line.
             if match:
                 tag, atts, ext, cite, content = match.groups()
-                (outer_tag, outer_atts, inner_tag, inner_atts, content,
-                        eat) = self.fBlock(**match.groupdict())
+                (outer_tag, outer_atts, inner_tag, inner_atts,
+                        content) = self.fBlock(**match.groupdict())
                 inner_block = generate_tag(inner_tag, content, inner_atts)
                 # code tags and raw text won't be indented inside outer_tag.
                 if inner_tag != 'code' and not has_raw_text(inner_block):
@@ -598,8 +598,8 @@ def block(self, text):
                     line = '{0}\n{1}'.format(out.pop(), line)
                 whitespace = ' \t\n\r\f\v'
                 if ext or not line[0] in whitespace:
-                    (outer_tag, outer_atts, inner_tag, inner_atts, content,
-                        eat) = self.fBlock(tag, atts, ext, cite, line)
+                    (outer_tag, outer_atts, inner_tag, inner_atts,
+                            content) = self.fBlock(tag, atts, ext, cite, line)
                     if tag == 'p' and not has_raw_text(content):
                         line = content
                     else:
@@ -612,7 +612,7 @@ def block(self, text):
             line = self.doPBr(line)
             line = re.sub(r'<br>', '<br />', line)
 
-            if not eat and line:
+            if line.strip():
                 out.append(line)
 
             if not ext:
@@ -651,8 +651,7 @@ def fBlock(self, tag, atts, ext, cite, content):
             # It will be empty if the regex matched and ate it.
             if '' == notedef:
                 content = notedef
-                return (outer_tag, outer_atts, inner_tag, inner_atts, content,
-                        eat)
+                return (outer_tag, outer_atts, inner_tag, inner_atts, content)
 
         fns = re.search(r'fn(?P<fnid>{0}+)'.format(regex_snippets['digit']),
                 tag, flags=re.U)
@@ -728,7 +727,7 @@ def fBlock(self, tag, atts, ext, cite, content):
             content = self.graf(content)
         else:
             content = ''
-        return (outer_tag, outer_atts, inner_tag, inner_atts, content, eat)
+        return (outer_tag, outer_atts, inner_tag, inner_atts, content)
 
     def footnoteRef(self, text):
         # somehow php-textile gets away with not capturing the space.