Merge 8ee283a into c8266d7

.travis.yml

@@ -3,22 +3,16 @@ language: python
 python:
  - pypy
  - pypy3
- - 2.6
  - 2.7
- - 3.2
- - 3.3
- - 3.4
+ - 3.6
  - 3.5
+ - 3.4
 
 sudo: false
 
 install:
  - pip install -r requirements.txt
- - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi
-
- # Coverage 4.0 doesn't support Python 3.2
- - if [ "$TRAVIS_PYTHON_VERSION" == "3.2" ]; then travis_retry pip install coverage==3.7.1; fi
- - if [ "$TRAVIS_PYTHON_VERSION" != "3.2" ]; then travis_retry pip install coverage; fi 
+ - pip install coverage
 
 script:
  - coverage run --source=inxwords ./test_inxwords.py -v
@@ -35,5 +29,3 @@ after_script:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - python: 2.6

test_inxwords.py

@@ -4,10 +4,7 @@
 Unit tests for inxwords.py
 """
 from __future__ import print_function, unicode_literals
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import inxwords