From 97178dd92b77f3790f9d8cf82e53b50ae9ffaf01 Mon Sep 17 00:00:00 2001
From: Rick van Hattem <Wolph@wol.ph>
Date: Thu, 31 Mar 2016 03:27:43 +0200
Subject: [PATCH 1/2] enabled python 3.5 support

---
 .travis.yml | 1 +
 tox.ini     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 876af276..e8295ae9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ env:
     - TOXENV=py32
     - TOXENV=py33
     - TOXENV=py34
+    - TOXENV=py35
     - TOXENV=pypy
     - TOXENV=cov
     - TOXENV=sith
diff --git a/tox.ini b/tox.ini
index 526092fc..d7ae5a3b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py32, py33, py34
+envlist = py26, py27, py32, py33, py34, py35
 [testenv]
 deps =
     pytest>=2.3.5

From 4afc74f1c7b44a1baecfe5b33c43db2b57aa797f Mon Sep 17 00:00:00 2001
From: Rick van Hattem <Wolph@wol.ph>
Date: Thu, 31 Mar 2016 03:38:32 +0200
Subject: [PATCH 2/2] fixing python 3.2 and 3.5 issues

---
 .travis.yml | 4 +++-
 tox.ini     | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e8295ae9..188c99f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,9 @@ matrix:
         - env: TOXENV=cov
         - env: TOXENV=sith
         - env: TOXENV=pypy
+python: 3.5
 install:
-    - pip install --quiet --use-mirrors tox
+    - pip install --quiet tox 'virtualenv<14.0.0' 'pip<8.0.0'
 script:
     - tox
 after_script:
@@ -24,3 +25,4 @@ after_script:
       pip install --quiet --use-mirrors coveralls;
       coveralls;
       fi
+
diff --git a/tox.ini b/tox.ini
index d7ae5a3b..4211ff44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,11 @@ commands =
 deps =
     unittest2
     {[testenv]deps}
+[testenv:py32]
+deps =
+    pip<8.0.0
+    virtualenv<14.0.0
+    {[testenv]deps}
 [testenv:cov]
 deps =
     coverage