Merge branch 'release/2.3.8'

Author: ikirudennis

CHANGELOG.textile

@@ -1,5 +1,16 @@
 h1. Textile Changelog
 
+h2. Version 2.3.8
+* Bugfix: Fix process of string containing only whitespaces ("#40":https://github.com/textile/python-textile/issues/40)
+* Bugfix: Fix process of formatted text after lists ("#37":https://github.com/textile/python-textile/issues/37)
+* Test: Use sys.executable instead of 'python' to test the CLI ("#38":https://github.com/textile/python-textile/issues/38)
+
+h2. Version 2.3.7
+* Bugfix: Don't assume pytest is available to be imported in setup.py ("#39":https://github.com/textile/python-textile/issues/39)
+
+h2. Version 2.3.6
+* Packaging: @tests@ directory is correctly included in source-tarball. ("#33":https://github.com/textile/python-textile/issues/33)
+
 h2. Version 2.3.5
 * Bugfix: Correctly handle unicode text in url query-strings. ("#36":https://github.com/textile/python-textile/issues/36)
 
@@ -8,7 +19,7 @@ h2. Version 2.3.4
 * Remove misplaced shebang on non-callable files.
 * Packaging: Add test-command to setup.py directly.
 * Packaging: Included the tests/ directory for source-tarballs, useful for packaging checks. ("#33":https://github.com/textile/python-textile/issues/33)
-* Add a cli tool `pytextile` which takes textile input and prints html output.  See `pytextile -h` for details.
+* Add a cli tool @pytextile@ which takes textile input and prints html output.  See @pytextile -h@ for details.
 
 h2. Version 2.3.3
 * Bugfix: Unicode in URL titles no longer break everything ("#30":https://github.com/textile/python-textile/issues/30)

MANIFEST.in

@@ -9,3 +9,4 @@ include MANIFEST.in
 include pytest.ini
 include README.textile
 include requirements.txt
+recursive_include tests

setup.py

@@ -1,7 +1,23 @@
 from setuptools import setup, find_packages
+from setuptools.command.test import test as TestCommand
 import os
 import sys
-import pytest
+
+
+class PyTest(TestCommand):
+    user_options = [('pytest-args=', 'a', "Arguments to pass to pytest")]
+
+    def initialize_options(self):
+        TestCommand.initialize_options(self)
+        self.pytest_args = []
+
+    def run_tests(self):
+        import shlex
+        #import here, cause outside the eggs aren't loaded
+        import pytest
+        errno = pytest.main(shlex.split(self.pytest_args))
+        sys.exit(errno)
+
 
 def get_version():
     basedir = os.path.dirname(__file__)
@@ -46,7 +62,7 @@ def get_version():
     entry_points={'console_scripts': ['pytextile=textile.__main__:main']},
     setup_requires=['pytest-runner'],
     tests_require=['pytest', 'pytest-cov'],
-    cmdclass = {'test': pytest},
+    cmdclass = {'test': PyTest},
     include_package_data=True,
     zip_safe=False,
 )

tests/test_cli.py

@@ -1,8 +1,9 @@
 import six
 import subprocess
+import sys
 
 def test_console_script():
-    command = ['python', '-m', 'textile', 'README.textile']
+    command = [sys.executable, '-m', 'textile', 'README.textile']
     try:
         result = subprocess.check_output(command)
     except AttributeError:

tests/test_github_issues.py

@@ -91,3 +91,15 @@ def test_github_issue_36():
     result = textile.textile(text)
     expect = '\t<p><a href="https://www.google.com/search?q=Chögyam+Trungpa">Chögyam Trungpa</a></p>'
     assert result == expect
+
+def test_github_issue_37():
+    text = '# xxx\n# yyy\n*blah*'
+    result = textile.textile(text)
+    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():
+    text = '\r\n'
+    result = textile.textile(text)
+    expect = '\r\n'
+    assert result == expect

textile/core.py

@@ -230,7 +230,7 @@ def parse(self, text, rel=None, sanitize=False):
         self.unreferencedNotes = OrderedDict()
         self.notelist_cache = OrderedDict()
 
-        if text == '':
+        if text.strip() == '':
             return text
 
         if self.restricted:
@@ -298,6 +298,7 @@ def textileLists(self, text):
 
     def fTextileList(self, match):
         text = re.split(r'\n(?=[*#;:])', match.group(), flags=re.M)
+        # import pdb; pdb.set_trace()
         pt = ''
         result = []
         ls = OrderedDict()
@@ -309,8 +310,13 @@ 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()
-            content = content.strip()
+            if m:
+                tl, start, atts, content = m.groups()
+                content = content.strip()
+            else:
+                result.append(line)
+                break
+
             nl = ''
             ltype = list_type(tl)
             tl_tags = {';': 'dt', ':': 'dd'}
@@ -365,7 +371,7 @@ def fTextileList(self, match):
             if tl not in ls:
                 ls[tl] = 1
                 itemtag = ("\n{0}\t<{1}>{2}".format(tabs, litem, content) if
-                           showitem else '')
+                            showitem else '')
                 line = "<{0}l{1}{2}>{3}".format(ltype, atts, start, itemtag)
             else:
                 line = ("\t<{0}{1}>{2}".format(litem, atts, content) if
@@ -811,7 +817,7 @@ def _closingsquarebracket(c, pop, popped, url_chars, counts, pre):
             """If we find a closing square bracket we are going to see if it is
             balanced.  If it is balanced with matching opening bracket then it
             is part of the URL else we spit it back out of the URL."""
-            # If counts['['] is None, count the occurrences of '[' 
+            # If counts['['] is None, count the occurrences of '['
             counts['['] = counts['['] or url.count('[')
 
             if counts['['] == counts[']']:

textile/objects/__init__.py

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

textile/objects/list.py

@@ -0,0 +1,29 @@
+from textile.utils import generate_tag
+
+class List(object):
+    def __init__(self, listtype, attributes={}):
+        super(List, self).__init__()
+        self.type = listtype
+        self.attributes = attributes
+        self.items = []
+
+    def add_item(self, tag, content, attributes={}):
+        item = ListItem(tag, content, attributes)
+        self.items.append(item.process())
+
+    def process(self):
+        content = '\n\t\t{0}\n\t'.format('\n\t\t'.join(self.items))
+        tag = generate_tag(self.type, content, self.attributes)
+        return '\t{0}\n'.format(tag)
+
+
+class ListItem(object):
+    def __init__(self, tag, content, attributes={}):
+        super(ListItem, self).__init__()
+        self.tag = tag
+        self.content = content
+        self.attributes = attributes
+
+    def process(self):
+        tag = generate_tag(self.tag, self.content, self.attributes)
+        return '{0}'.format(tag)

textile/version.py

@@ -1 +1 @@
-VERSION = '2.3.5'
+VERSION = '2.3.8'