Merge branch 'release/2.3.1'

Author: ikirudennis

.coveragerc

@@ -0,0 +1,7 @@
+[run]
+branch = True
+
+[report]
+show_missing = True
+omit = 
+	textile/tests/*

.gitignore

@@ -4,14 +4,17 @@
 *~
 *.pyo
 *.egg-info
+.cache/
 .coverage
+.eggs/
 .noseids*
 docs/build
 docs/coverage
 build
 bin
 dist
 eggs
+htmlcov
 parts
 develop-eggs
 .DS_Store

.travis.yml

@@ -1,15 +1,25 @@
 language: python
+env:
+  - REQUIREMENTS=true
+  - REQUIREMENTS=false
 python:
   - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
   - "pypy"
 # command to install dependencies
 install:
-  - pip install -r requirements.txt
-  - python setup.py -q install
-  - if [[ ! $TRAVIS_PYTHON_VERSION == pypy ]] ; then pip install regex; fi
+  - if [[ $REQUIREMENTS == true ]] ; then pip install -r requirements.txt ; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]] ; then pip install coverage==3.7.1; fi
+  - pip install coveralls pytest pytest-cov coverage codecov
+  - pip install -e .
+  - if [[ ! $TRAVIS_PYTHON_VERSION == 'pypy' ]] ; then pip install regex; fi
 # command to run tests
-script: nosetests
+script: py.test
+sudo: false
+after_success:
+  - coveralls
+  - codecov

CHANGELOG.textile

@@ -1,19 +1,38 @@
 h1. Textile Changelog
 
-h1. Version 2.2.1
+h2. Version 2.3.1
+* Regression bugfix: empty string input returns empty string again.
+
+h2. Version 2.3.0
+
+* Bugfixes:
+** Support data URIs in img tags
+** Fix autolink urls with image references ("#17":https://github.com/textile/python-textile/issues/17)
+** Fix textile links containing parentheses ("#20":https://github.com/textile/python-textile/issues/20)
+** Fix double-encoding of code blocks ("#21":https://github.com/textile/python-textile/issues/21)
+** Fix handling of scheme in self-linked URLs ("#16":https://github.com/textile/python-textile/issues/16)
+** Fix Markup not parsed if followed by certain characters ("#22":Markup not parsed if followed by certain characters)
+* Convert testing over to "py.test":http://pytest.org/, improving unicode testing
+* Update functionality for tables, notelists, and footnotes.  This involved a major reworking of parts of the code, but it should now match php-textile and txstyle.org precisely.  Please file an issue for any bugs you come across.
+
+h2. Version 2.2.2
+
+* bugfix: "regex":https://pypi.python.org/pypi/regex is now an optional dependency
+
+h2. Version 2.2.1
 
 * drop textilefactory support for html.
 * Various development-related bugfixes.
 * Added this changelog.
 
-h1. Version 2.2.0
+h2. Version 2.2.0
 
 * Started refactoring the code to be less repetitive.  @textile.Textile().parse()@ is a little more friendly than @textile.Textile().textile()@  There may be more work to be done on this front to make the flow a little smoother.
 * We now support versions 2.6 - 3.4 (including 3.2) using the same codebase.  Many thanks to Radek Czajka for this.
 * Drop support for html4.  We now only output xhtml or html5.
 * Various development-related bugfixes.
 
-h1. Version 2.1.8
+h2. Version 2.1.8
 
 * Add support for html5 output.
 * Lots of new functionality added bringing us in line with the official Textile 2.4

README.textile

@@ -1,14 +1,16 @@
-!https://travis-ci.org/textile/python-textile.svg?branch=develop!:https://travis-ci.org/textile/python-textile
+!https://travis-ci.org/textile/python-textile.svg!:https://travis-ci.org/textile/python-textile !https://coveralls.io/repos/github/textile/python-textile/badge.svg!:https://coveralls.io/github/textile/python-textile?branch=master !https://codecov.io/github/textile/python-textile/coverage.svg!:https://codecov.io/github/textile/python-textile
 
 h1. python-textile
 
-python-textile is a Python port of Textile, Dean Allen's humane web text generator.
+python-textile is a Python port of "Textile":http://txstyle.org/, Dean Allen's humane web text generator.
 
 h2. Installation
 
-Install the 'textile' folder on your python path, or @pip install textile@.
-Optional dependencies include PIL/Pillow (for checking images size)
-and regex (for faster unicode-aware string matching).
+@pip install textile@
+
+Optional dependencies include:
+* "PIL/Pillow":http://python-pillow.github.io/ (for checking images size)
+* "regex":https://pypi.python.org/pypi/regex (for faster unicode-aware string matching).
 
 h2. Usage
 

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+testpaths = tests
+addopts = --cov=textile --cov-report=html --cov-append --cov-report=term-missing

requirements.txt

@@ -1,4 +1,2 @@
-nose==1.3.4
-coverage==3.7.1
 html5lib==0.999
-Pillow==2.6.0
+Pillow==3.0.0

setup.cfg

@@ -1,9 +1,4 @@
-[nosetests]
-detailed-errors=1
-with-coverage=1
-cover-package=textile
-cover-erase=1
-with-doctest=1
-with-id = 1
+[aliases]
+test=pytest
 [bdist_wheel]
 universal=1

setup.py

@@ -2,14 +2,6 @@
 import os
 import sys
 
-install_requires = []
-
-
-if 'develop' in sys.argv:
-    install_requires.extend([
-        'tox',
-    ])
-
 def get_version():
     basedir = os.path.dirname(__file__)
     with open(os.path.join(basedir, 'textile/version.py')) as f:
@@ -32,14 +24,24 @@ def get_version():
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Topic :: Software Development :: Libraries :: Python Modules',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ],
-    keywords='textile,text',
-    install_requires=install_requires,
+    keywords='textile,text,html markup',
+    install_requires=['six',],
     extras_require={
         ':python_version=="2.6"': ['ordereddict>=1.1'],
+        'develop': ['regex', 'pytest', 'pytest-cov'],
     },
-    test_suite='nose.collector',
-    tests_require=['nose'],
+    setup_requires=['pytest-runner'],
+    tests_require=['pytest', 'pytest-cov'],
     include_package_data=True,
     zip_safe=False,
 )

tests/test_attributes.py

@@ -0,0 +1,15 @@
+from textile.utils import parse_attributes
+import re
+
+def test_parse_attributes():
+    assert parse_attributes('\\1', element='td') == {'colspan': '1'}
+    assert parse_attributes('/1', element='td') == {'rowspan': '1'}
+    assert parse_attributes('^', element='td') == {'style': 'vertical-align:top;'}
+    assert parse_attributes('{color: blue}') == {'style': 'color: blue;'}
+    assert parse_attributes('[en]') == {'lang': 'en'}
+    assert parse_attributes('(cssclass)') == {'class': 'cssclass'}
+    assert parse_attributes('(') == {'style': 'padding-left:1em;'}
+    assert parse_attributes(')') == {'style': 'padding-right:1em;'}
+    assert parse_attributes('<') == {'style': 'text-align:left;'}
+    assert parse_attributes('(c#i)') == {'class': 'c', 'id': 'i'}
+    assert parse_attributes('\\2 100', element='col') == {'span': '2', 'width': '100'}