undoing some things that will continue on a feature branch.

Author: ikirudennis

tests/test_github_issues.py

@@ -93,9 +93,9 @@ def test_github_issue_36():
     assert result == expect
 
 def test_github_issue_37():
-    text = '* xxx\n* yyy\n*blah*\n* test'
+    text = '# xxx\n# yyy\n*blah*'
     result = textile.textile(text)
-    expect = '\t<ul>\n\t\t<li>xxx</li>\n\t\t<li>yyy<br />\n<strong>blah</strong></li>\n\t\t<li>test</li>\n\t</ul>'
+    expect = '\t<p>\t<ol>\n\t\t<li>xxx</li>\n\t\t<li>yyy</li>\n\t</ol><br />\n<strong>blah</strong></p>'
     assert result == expect
 
 def test_github_issue_40():

textile/core.py

@@ -27,7 +27,7 @@
 from textile.utils import (decode_high, encode_high, encode_html, generate_tag,
         has_raw_text, is_rel_url, is_valid_url, list_type, normalize_newlines,
         parse_attributes, pba)
-from textile.objects import Block, List, Table
+from textile.objects import Block, Table
 
 
 try:
@@ -297,7 +297,7 @@ def textileLists(self, text):
         return pattern.sub(self.fTextileList, text)
 
     def fTextileList(self, match):
-        text = re.split(r'\n(?=[*#;:]+\s)', match.group(), flags=re.M)
+        text = re.split(r'\n(?=[*#;:])', match.group(), flags=re.M)
         # import pdb; pdb.set_trace()
         pt = ''
         result = []
@@ -310,15 +310,15 @@ def fTextileList(self, match):
 
             m = re.search(r"^(?P<tl>[#*;:]+)(?P<st>_|\d+)?(?P<atts>{0})[ .]"
                     "(?P<content>.*)$".format(cls_re_s), line, re.S)
-            tl, start, atts, content = m.groups()
-            attributes = parse_attributes(atts)
-            content = content.strip()
-            if '\n' in content:
-                content = content.replace('\n', '<br />\n')
+            if m:
+                tl, start, atts, content = m.groups()
+                content = content.strip()
+            else:
+                result.append(line)
+                break
+
             nl = ''
             ltype = list_type(tl)
-            if i == 0:
-                _list = List('{0}l'.format(ltype), attributes)
             tl_tags = {';': 'dt', ':': 'dd'}
             litem = tl_tags.get(tl[0], 'li')
 
@@ -343,7 +343,6 @@ def fTextileList(self, match):
                 # put together the start attribute if needed
                 if len(tl) > len(pt) and start is not None:
                     start = ' start="{0}"'.format(self.olstarts[tl])
-                    _list.attributes['start'] = str(self.olstarts[tl])
 
                 # This will only increment the count for list items, not
                 # definition items
@@ -371,19 +370,12 @@ def fTextileList(self, match):
             # item, else just create the item
             if tl not in ls:
                 ls[tl] = 1
-                if i == 0:
-                    _list.add_item(litem, content)
-                else:
-                    itemtag = ("\n{0}\t<{1}>{2}".format(tabs, litem, content) if
-                               showitem else '')
-                    _sublist = List(litem, attributes)
-                    line = "<{0}l{1}{2}>{3}".format(ltype, atts, start, itemtag)
-                    _sublist.add_item(litem, content)
-                    line = _sublist.process()
+                itemtag = ("\n{0}\t<{1}>{2}".format(tabs, litem, content) if
+                            showitem else '')
+                line = "<{0}l{1}{2}>{3}".format(ltype, atts, start, itemtag)
             else:
                 line = ("\t<{0}{1}>{2}".format(litem, atts, content) if
                         showitem else '')
-                _list.add_item(litem, content, attributes)
             line = '{0}{1}'.format(tabs, line)
 
             if len(nl) <= len(tl):
@@ -408,7 +400,7 @@ def fTextileList(self, match):
             #else:
                 #line = "{0}\n".format(line)
             result.append(line)
-        return self.doTagBr(litem, _list.process())
+        return self.doTagBr(litem, "\n".join(result))
 
     def doTagBr(self, tag, input):
         return re.compile(r'<({0})([^>]*?)>(.*)(</\1>)'.format(re.escape(tag)),

textile/objects/__init__.py

@@ -2,4 +2,4 @@
 from .list import List
 from .table import Table
 
-__all__ = ['Block', 'List', 'Table']
+__all__ = ['Block', 'Table']