Merge branch 'release/2.3.12'

Author: ikirudennis

.travis.yml

@@ -9,6 +9,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
   - "pypy"
 # command to install dependencies
 install:

CHANGELOG.textile

@@ -1,5 +1,12 @@
 h1. Textile Changelog
 
+h2. Version 2.3.12
+* Bugfix: Don't die on pre blocks with unicode characters. ("#43":https://github.com/textile/python-textile/issues/43)
+* Bugfix: Fix regressions introduced into the code between 2.2.2 and 2.3.11. (Special thanks to "@adam-iris":https://github.com/adam-iris for providing pull request "#44":https://github.com/textile/python-textile/pull/44)
+* Bugfix: Don't just die when processing poorly-formatted textile lists. ("#37":https://github.com/textile/python-textile/issues/37)
+* Add Python 3.6 to testing.
+* Add a "print the version string and exit" argument to the cli tool: @pytextile -v@
+
 h2. Version 2.3.11
 * Bugfix: Don't strip leading dot from image URIs ("#42":https://github.com/textile/python-textile/issues/42)
 

setup.py

@@ -52,6 +52,7 @@ def get_version():
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     keywords='textile,text,html markup',
     install_requires=['six',],
@@ -66,4 +67,3 @@ def get_version():
     include_package_data=True,
     zip_safe=False,
 )
-

tests/test_block.py

@@ -62,3 +62,10 @@ def test_blockcode_in_README():
     with open('tests/fixtures/README.txt') as f:
         expect = ''.join(f.readlines())
     assert result == expect
+
+def test_blockcode_comment():
+    input = '###.. block comment\nanother line\n\np. New line'
+    expect = '\t<p>New line</p>'
+    t = textile.Textile()
+    result = t.parse(input)
+    assert result == expect

tests/test_cli.py

@@ -2,6 +2,8 @@
 import subprocess
 import sys
 
+import textile
+
 def test_console_script():
     command = [sys.executable, '-m', 'textile', 'README.textile']
     try:
@@ -15,3 +17,15 @@ def test_console_script():
     if type(result) == bytes:
         result = result.decode('utf-8')
     assert result == expect
+
+def test_version_string():
+    command = [sys.executable, '-m', 'textile', '-v']
+    try:
+        result = subprocess.check_output(command)
+    except AttributeError:
+        command[2] = 'textile.__main__'
+        result = subprocess.Popen(command,
+                stdout=subprocess.PIPE).communicate()[0]
+    if type(result) == bytes:
+        result = result.decode('utf-8')
+    assert result.strip() == textile.__version__

tests/test_github_issues.py

@@ -27,7 +27,7 @@ def test_github_issue_21():
   bar
 </foo>'''
     result = textile.textile(text)
-    expect = '\t<h1>xml example</h1>\n\n<pre><code>\n&lt;foo&gt;\n  bar\n&lt;/foo&gt;\n</code></pre>'
+    expect = '\t<h1>xml example</h1>\n\n<pre><code>\n&lt;foo&gt;\n  bar\n&lt;/foo&gt;</code></pre>'
     assert result == expect
 
 def test_github_issue_22():
@@ -98,6 +98,21 @@ def test_github_issue_37():
     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
 
+    text = '*Highlights*\n\n* UNITEK Y-3705A Type-C Universal DockingStation Pro\n* USB3.0/RJ45/EARPHONE/MICROPHONE/HDMI 6 PORT HUB 1.2m Data Cable 5V 4A Power Adaptor\n*\n* Dimensions: 25cm x 13cm x 9cm\n* Weight: 0.7kg'
+    result = textile.textile(text)
+    expect = '''\t<p><strong>Highlights</strong></p>
+
+\t<ul>
+\t\t<li><span class="caps">UNITEK</span> Y-3705A Type-C Universal DockingStation Pro</li>
+\t\t<li>USB3.0/RJ45/EARPHONE/MICROPHONE/HDMI 6 <span class="caps">PORT</span> <span class="caps">HUB</span> 1.2m Data Cable 5V 4A Power Adaptor</li>
+\t</ul>
+*
+\t<ul>
+\t\t<li>Dimensions: 25cm x 13cm x 9cm</li>
+\t\t<li>Weight: 0.7kg</li>
+\t</ul>'''
+    assert result == expect
+
 def test_github_issue_40():
     text = '\r\n'
     result = textile.textile(text)
@@ -109,3 +124,9 @@ def test_github_issue_42():
     result = textile.textile(text)
     expect = '\t<p><img alt="" src="./image.png" /></p>'
     assert result == expect
+
+def test_github_issue_43():
+    text = 'pre. smart ‘quotes’ are not smart!'
+    result = textile.textile(text)
+    expect = '<pre>smart ‘quotes’ are not smart!</pre>'
+    assert result == expect

tests/test_urls.py

@@ -46,6 +46,14 @@ def test_urls():
     expect = '\t<p>A link that starts with an h is <a href="/test/">handled</a> incorrectly.</p>'
     assert result == expect
 
+    result = t.parse('A link that starts with a space" raises":/test/ an exception.')
+    expect = '\t<p><a href="/test/">A link that starts with a space&#8221; raises</a> an exception.</p>'
+    assert result == expect
+
+    result = t.parse('A link that "contains a\nnewline":/test/ raises an exception.')
+    expect = '\t<p>A link that <a href="/test/">contains a\nnewline</a> raises an exception.</p>'
+    assert result == expect
+
 def test_rel_attribute():
     t = Textile(rel='nofollow')
     result = t.parse('"$":http://domain.tld')

tests/test_values.py

@@ -219,7 +219,7 @@
      '\t<p style="font-size:0.8em;"><strong>TxStyle</strong> is a documentation project of Textile 2.4 for <a href="http://texpattern.com">Textpattern <span class="caps">CMS</span></a>.</p>'),
     (""""Übermensch":http://de.wikipedia.org/wiki/Übermensch""", """\t<p><a href="http://de.wikipedia.org/wiki/%C3%9Cbermensch">Übermensch</a></p>"""),
     ("""Here is some text with a <!-- Commented out[1] --> block.\n\n<!-- Here is a single <span>line</span> comment block -->\n\n<!-- Here is a whole\nmultiline\n<span>HTML</span>\nComment\n-->\n\nbc. <!-- Here is a comment block in a code block. -->""",
-     """\t<p>Here is some text with a <!-- Commented out[1] --> block.</p>\n\n\t<p><!-- Here is a single <span>line</span> comment block --></p>\n\n\t<p><!-- Here is a whole\nmultiline\n<span>HTML</span>\nComment\n--></p>\n\n<pre><code>&lt;!-- Here is a comment block in a code block. --&gt;\n</code></pre>"""),
+     """\t<p>Here is some text with a <!-- Commented out[1] --> block.</p>\n\n\t<p><!-- Here is a single <span>line</span> comment block --></p>\n\n\t<p><!-- Here is a whole\nmultiline\n<span>HTML</span>\nComment\n--></p>\n\n<pre><code>&lt;!-- Here is a comment block in a code block. --&gt;</code></pre>"""),
     (""""Textile(c)" is a registered(r) 'trademark' of Textpattern(tm) -- or TXP(That's textpattern!) -- at least it was - back in '88 when 2x4 was (+/-)5(o)C ... QED!\n\np{font-size: 200%;}. 2(1/4) 3(1/2) 4(3/4)""",
      """\t<p>&#8220;Textile&#169;&#8221; is a registered&#174; &#8216;trademark&#8217; of Textpattern&#8482; &#8212; or <acronym title="That&#8217;s textpattern!"><span class="caps">TXP</span></acronym> &#8212; at least it was &#8211; back in &#8217;88 when 2&#215;4 was &#177;5&#176;C &#8230; <span class="caps">QED</span>!</p>\n\n\t<p style="font-size: 200%;">2&#188; 3&#189; 4&#190;</p>"""),
     ("""|=. Testing colgroup and col syntax\n|:\\5. 80\n|a|b|c|d|e|\n\n|=. Testing colgroup and col syntax|\n|:\\5. 80|\n|a|b|c|d|e|""", """\t<table>\n\t<caption>Testing colgroup and col syntax</caption>\n\t<colgroup span="5" width="80">\n\t</colgroup>\n\t\t<tr>\n\t\t\t<td>a</td>\n\t\t\t<td>b</td>\n\t\t\t<td>c</td>\n\t\t\t<td>d</td>\n\t\t\t<td>e</td>\n\t\t</tr>\n\t</table>\n\n\t<table>\n\t<caption>Testing colgroup and col syntax</caption>\n\t<colgroup span="5" width="80">\n\t</colgroup>\n\t\t<tr>\n\t\t\t<td>a</td>\n\t\t\t<td>b</td>\n\t\t\t<td>c</td>\n\t\t\t<td>d</td>\n\t\t\t<td>e</td>\n\t\t</tr>\n\t</table>"""),
@@ -230,7 +230,7 @@
     (""";(class#id) Term 1\n: Def 1\n: Def 2\n: Def 3""",
      """\t<dl class="class" id="id">\n\t\t<dt>Term 1</dt>\n\t\t<dd>Def 1</dd>\n\t\t<dd>Def 2</dd>\n\t\t<dd>Def 3</dd>\n\t</dl>"""),
     ("""*Here is a comment*\n\nHere is *(class)a comment*\n\n*(class)Here is a class* that is a little extended and is\n*followed* by a strong word!\n\nbc. ; Content-type: text/javascript\n; Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0\n; Expires: Sat, 24 Jul 2003 05:00:00 GMT\n; Last-Modified: Wed, 1 Jan 2025 05:00:00 GMT\n; Pragma: no-cache\n\n*123 test*\n\n*test 123*\n\n**123 test**\n\n**test 123**""",
-     """\t<p><strong>Here is a comment</strong></p>\n\n\t<p>Here is <strong class="class">a comment</strong></p>\n\n\t<p><strong class="class">Here is a class</strong> that is a little extended and is<br />\n<strong>followed</strong> by a strong word!</p>\n\n<pre><code>; Content-type: text/javascript\n; Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0\n; Expires: Sat, 24 Jul 2003 05:00:00 GMT\n; Last-Modified: Wed, 1 Jan 2025 05:00:00 GMT\n; Pragma: no-cache\n</code></pre>\n\n\t<p><strong>123 test</strong></p>\n\n\t<p><strong>test 123</strong></p>\n\n\t<p><b>123 test</b></p>\n\n\t<p><b>test 123</b></p>"""),
+     """\t<p><strong>Here is a comment</strong></p>\n\n\t<p>Here is <strong class="class">a comment</strong></p>\n\n\t<p><strong class="class">Here is a class</strong> that is a little extended and is<br />\n<strong>followed</strong> by a strong word!</p>\n\n<pre><code>; Content-type: text/javascript\n; Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0\n; Expires: Sat, 24 Jul 2003 05:00:00 GMT\n; Last-Modified: Wed, 1 Jan 2025 05:00:00 GMT\n; Pragma: no-cache</code></pre>\n\n\t<p><strong>123 test</strong></p>\n\n\t<p><strong>test 123</strong></p>\n\n\t<p><b>123 test</b></p>\n\n\t<p><b>test 123</b></p>"""),
     ("""#_(first#list) one\n# two\n# three\n\ntest\n\n#(ordered#list2).\n# one\n# two\n# three\n\ntest\n\n#_(class_4).\n# four\n# five\n# six\n\ntest\n\n#_ seven\n# eight\n# nine\n\ntest\n\n# one\n# two\n# three\n\ntest\n\n#22 22\n# 23\n# 24""",
      """\t<ol class="first" id="list" start="1">\n\t\t<li>one</li>\n\t\t<li>two</li>\n\t\t<li>three</li>\n\t</ol>\n\n\t<p>test</p>\n\n\t<ol class="ordered" id="list2">\n\t\t<li>one</li>\n\t\t<li>two</li>\n\t\t<li>three</li>\n\t</ol>\n\n\t<p>test</p>\n\n\t<ol class="class_4" start="4">\n\t\t<li>four</li>\n\t\t<li>five</li>\n\t\t<li>six</li>\n\t</ol>\n\n\t<p>test</p>\n\n\t<ol start="7">\n\t\t<li>seven</li>\n\t\t<li>eight</li>\n\t\t<li>nine</li>\n\t</ol>\n\n\t<p>test</p>\n\n\t<ol>\n\t\t<li>one</li>\n\t\t<li>two</li>\n\t\t<li>three</li>\n\t</ol>\n\n\t<p>test</p>\n\n\t<ol start="22">\n\t\t<li>22</li>\n\t\t<li>23</li>\n\t\t<li>24</li>\n\t</ol>"""),
     ("""# one\n##3 one.three\n## one.four\n## one.five\n# two\n\ntest\n\n#_(continuation#section2).\n# three\n# four\n##_ four.six\n## four.seven\n# five\n\ntest\n\n#21 twenty-one\n# twenty-two""",

textile/__main__.py

@@ -13,12 +13,18 @@ def main():
                    'accepts input as a file or stdin and can write out to '
                    'a file or stdout.')
     parser = argparse.ArgumentParser(prog=prog, description=description)
+    parser.add_argument('-v', '--version', action='store_true',
+                        help='show the version number and exit')
     parser.add_argument('infile', nargs='?', type=argparse.FileType(),
                         help='a textile file to be converted')
     parser.add_argument('outfile', nargs='?', type=argparse.FileType('w'),
                         help='write the output of infile to outfile')
     options = parser.parse_args()
 
+    if options.version:
+        print(textile.VERSION)
+        sys.exit()
+
     infile = options.infile or sys.stdin
     outfile = options.outfile or sys.stdout
     with infile:

textile/core.py

@@ -298,7 +298,6 @@ 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()
@@ -315,7 +314,7 @@ def fTextileList(self, match):
                 content = content.strip()
             else:
                 result.append(line)
-                break
+                continue
 
             nl = ''
             ltype = list_type(tl)
@@ -465,7 +464,7 @@ def block(self, text):
             else:
                 # if we're inside an extended block, add the text from the
                 # previous extension to the front
-                if ext:
+                if ext and out:
                     line = '{0}\n\n{1}'.format(out.pop(), line)
                 whitespace = ' \t\n\r\f\v'
                 if ext or not line[0] in whitespace:
@@ -494,7 +493,7 @@ def block(self, text):
                 cite = ''
                 graf = ''
 
-        if ext:
+        if ext and out:
             out.append(generate_tag(block.outer_tag, out.pop(),
                 block.outer_atts))
         return '\n\n'.join(out)
@@ -672,7 +671,10 @@ def markStartOfLinks(self, text):
                             balanced = balanced - 1
                         if re.search(r'\S$', possibility, flags=re.U): # pragma: no branch
                             balanced = balanced + 1
-                        possibility = possible_start_quotes.pop()
+                        try:
+                            possibility = possible_start_quotes.pop()
+                        except IndexError:
+                            break
                     else:
                         # If quotes occur next to each other, we get zero
                         # length strings.  eg. ...""Open the door,
@@ -756,9 +758,9 @@ def fLink(self, m):
             $'''.format(cls_re_s, regex_snippets['space']), inner,
                 flags=re.X | re.U)
 
-        atts = m.group('atts') or ''
-        text = m.group('text') or '' or inner
-        title = m.group('title') or ''
+        atts = (m and m.group('atts')) or ''
+        text = (m and m.group('text')) or inner
+        title = (m and m.group('title')) or ''
 
         pop, tight = '', ''
         counts = { '[': None, ']': url.count(']'), '(': None, ')': None }