Merge branch 'feature/python32'

.travis.yml

 ---
 language: python
-python: ["2.7", "3.3", "3.4", "3.5"]
+python: ["2.7", "3.2", "3.3", "3.4", "3.5"]
 dist: trusty
 sudo: false
 cache:
   - pip
+matrix:
+  include:
+    - python: "3.5"
+      env: TOXENV=docs
+  allow_failures:
+    - python: "3.2"
 
 install:
   - pip install tox-travis

README.rst

@@ -46,7 +46,8 @@ The following Jinja filters were added:
 - :code:`pprint`: Pretty print variable.
 - :code:`combine`: Combine 2 dictionaries.
 
-Example usage can be seen in :code:`tests.sh`.
+Example usage can be seen in :code:`tests.sh` and for specific filters in the
+docstrings in :code:`template/filters.py`.
 
 Testing
 -------
@@ -79,6 +80,8 @@ at: https://www.shore.co.il/git/.
 TODO
 ----
 
+- Fix test failure on Python 3.2
+  (https://travis-ci.org/adarnimrod/template/jobs/194581463).
 - Release on tagged commits to PyPI in Travis CI
   (https://docs.travis-ci.com/user/deployment/pypi/ and
   https://docs.travis-ci.com/user/encryption-keys/).

template/filters.py

@@ -47,9 +47,9 @@ def from_json(value):
 
     >>> from_json('[1, 2, 3]')
     [1, 2, 3]
-    >>> from_json('"a"') == six.text_type(u'a')
+    >>> from_json('"a"') == six.text_type('a')
     True
-    >>> from_json('{"1": {"a": [1, 2, 3]}}') == {u'1': {u'a': [1, 2, 3]}}
+    >>> from_json('{"1": {"a": [1, 2, 3]}}') == {'1': {'a': [1, 2, 3]}}
     True
     '''
     from json import loads

tox.ini

@@ -19,11 +19,15 @@ deps =
     flake8
 commands =
     check-manifest --ignore tox.ini,tests*
-    python setup.py check -m -r -s
     flake8 .
     python -m doctest template/filters.py template/__init__.py
     ./tests.sh
 
+[testenv:docs]
+basepython = python
+deps = readme_renderer
+commands = python setup.py check -m -r -s
+
 [testenv:release]
 basepython = python
 whitelist_externals =