From d664d23f01bc366c57a0a7653a843abd8fa17881 Mon Sep 17 00:00:00 2001
From: Rato <rato.aq2@gmail.com>
Date: Sat, 27 May 2017 20:23:58 +0200
Subject: [PATCH] Adding python 3.6 support

---
 .travis.yml | 3 ++-
 setup.py    | 1 +
 tox.ini     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fd4122..3b153ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - 3.6
   - pypy
 install:
   - pip install pip --upgrade
@@ -11,7 +12,7 @@ install:
   - pip install pytest --upgrade
   - pip install coveralls
 script:
-  - if [ $TRAVIS_PYTHON_VERSION != 2.6 ]; then pylint guessit; fi
+  - pylint guessit
   - coverage run --source=guessit setup.py test
   - python setup.py build
 after_success:
diff --git a/setup.py b/setup.py
index 1612c68..9d1907b 100644
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,7 @@ args = dict(name='guessit',
                          'Programming Language :: Python :: 3.3',
                          'Programming Language :: Python :: 3.4',
                          'Programming Language :: Python :: 3.5',
+                         'Programming Language :: Python :: 3.6',
                          'Topic :: Multimedia',
                          'Topic :: Software Development :: Libraries :: Python Modules'
                          ],
diff --git a/tox.ini b/tox.ini
index 3f87db3..eca7d0c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,py35,pypy
+envlist = py27,py33,py34,py35,py36,pypy
 
 [testenv]
 commands =