Update tox, dropping Python 2.6 and Python 3.3 but adding 3.5 and 3.6.

Also update a test to ensure 100% test module coverage.

Author: SmileyChris

TESTING.rst

@@ -3,19 +3,17 @@ Testing
 
 First, install tox into your virtualenv::
 
-    pip install -U tox
+    pip install --upgrade tox
 
-To run all the qrcode tests, you'll need to install the older Python
-interpreters. Here's how you'll do it on a modern Ubuntu distribution::
+To run all tests, you'll need to install multiple Python interpreters. On a
+modern Ubuntu distribution you can use ``add-apt-repository
+ppa:deadsnakes/ppa``.
 
-    sudo add-apt-repository ppa:deadsnakes/ppa
-    sudo apt-get update
-    sudo apt-get install python2.4-dev python2.6-dev
+Depending on if you can install the wheels directly for your OS, you may need
+the libraries to build PIL, too. Here's the Ubuntu commands::
 
-Ensure you have the libraries to build PIL, too::
-
-    sudo apt-get install build-essential python-dev python3-dev 
+    sudo apt-get install build-essential python-dev python3-dev
     sudo apt-get install libjpeg8-dev zlib1g-dev
 
 Finally, just run ``tox``!
-If you want, you can test against a specific version like this: ``tox -e py33``
+If you want, you can test against a specific version like this: ``tox -e py36``

qrcode/tests/test_script.py

@@ -47,6 +47,9 @@ def test_stdin_py3_unicodedecodeerror(self, mock_print_ascii):
         mock_stdin.buffer.read.return_value = 'testtext'
         mock_stdin.read.side_effect = bad_read
         with mock.patch('sys.stdin', mock_stdin):
+            # sys.stdin.read() will raise an error...
+            self.assertRaises(UnicodeDecodeError, sys.stdin.read)
+            # ... but it won't be used now.
             main([])
         mock_print_ascii.assert_called_with(tty=True)
 

tox.ini

@@ -1,10 +1,11 @@
 [tox]
 distribute = False
 envlist =
-    coverage_setup,
-    py26, py27, py33, py34,
-    readme,
+    coverage_setup
+    py{27,34,35,36}
+    readme
     coverage_report
+skip_missing_interpreters = True
 
 [testenv]
 usedevelop = True
@@ -13,22 +14,10 @@ deps =
     pillow
     git+git://github.com/ojii/pymaging.git#egg=pymaging
     git+git://github.com/ojii/pymaging-png.git#egg=pymaging-png
+    py27: mock
 commands =
     {envbindir}/coverage run -a --source qrcode -m unittest {posargs:discover qrcode}
 
-[testenv:py27]
-deps =
-    {[testenv]deps}
-    mock
-
-[testenv:py26]
-deps =
-    {[testenv:py27]deps}
-    unittest2
-    lxml
-commands =
-    {envbindir}/coverage run -a --source qrcode {envbindir}/unit2 {posargs:discover qrcode}
-
 [testenv:readme]
 deps =
     docutils
@@ -47,4 +36,5 @@ deps =
   coverage
 commands =
   coverage html
-  coverage report --fail-under=90 -m
+  coverage report --include="qrcode/tests/*" --fail-under=100 -m
+  coverage report --omit="qrcode/tests/*" --fail-under=90 -m