From 6dc522aa3fce5023938f411bd3805a4d8d9fac60 Mon Sep 17 00:00:00 2001
From: Peter Hamilton <peter.allen.hamilton@gmail.com>
Date: Fri, 11 Nov 2016 15:17:20 -0500
Subject: [PATCH] Adding support for Python 3.5

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

diff --git a/.travis.yml b/.travis.yml
index 83a247e..7415e91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,20 @@
 language: python
+matrix:
+    include:
+        - python: 2.6
+          env: TOXENV=py26
+        - python: 2.7
+          env: TOXENV=py27
+        - python: 3.3
+          env: TOXENV=py33
+        - python: 3.4
+          env: TOXENV=py34
+        - python: 3.5
+          env: TOXENV=py35
+        - python: 2.7
+          env: TOXENV=pep8
+        - python: 2.7
+          env: TOXENV=bandit
 install:
   - pip install tox
   - pip install bandit
@@ -6,13 +22,6 @@ install:
   - pip install coveralls
 script:
   - tox
-env:
-  - TOXENV=pep8
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=bandit
 after_success:
   - codecov
   - coveralls
diff --git a/setup.py b/setup.py
index 89987e5..e932d42 100644
--- a/setup.py
+++ b/setup.py
@@ -60,5 +60,6 @@ setuptools.setup(
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
     ],
 )
diff --git a/tox.ini b/tox.ini
index 1ad993c..a7de2a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py26,py27,py33,py34,bandit
+envlist = pep8,py26,py27,py33,py34,py35,bandit
 
 [testenv]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH