Add Python 3.6 (#76)

3 files changed, 9 insertions, 1 deletions

diff --git a/.travis.yml b/.travis.yml
index 90aa3d9..ebaf846 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 install:
   - pip install tox
 script:
diff --git a/setup.py b/setup.py
index e30df8e..e6c5c83 100755
--- a/setup.py
+++ b/setup.py
@@ -93,7 +93,14 @@ def run_setup(with_binary):
             'License :: OSI Approved :: BSD License',
             'Operating System :: OS Independent',
             '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.3',
+            'Programming Language :: Python :: 3.4',
+            'Programming Language :: Python :: 3.5',
+            'Programming Language :: Python :: 3.6',
             'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
             'Topic :: Software Development :: Libraries :: Python Modules',
             'Topic :: Text Processing :: Markup :: HTML'
diff --git a/tox.ini b/tox.ini
index 5dce2fc..b441cb7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py33,py34,py35
+envlist = py26,py27,pypy,py33,py34,py35,py36
 
 [testenv]
 commands = py.test tests.py {posargs}