From 4f7d108722212f92f1abed9933ad2060a9b10853 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Tue, 28 Jun 2016 22:06:08 -0700
Subject: [PATCH] compile docs on python 3.5

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

diff --git a/.travis.yml b/.travis.yml
index 8599badcc..a6f759133 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ matrix:
       env: TOXENV=py27
     - python: 3.5
       env: TOXENV=lint
-    - python: 2.7
+    - python: 3.5
       env: TOXENV=docs
   allow_failures:
     - python: pypy
diff --git a/setup.py b/setup.py
index c0ad74891..991efa152 100644
--- a/setup.py
+++ b/setup.py
@@ -105,7 +105,7 @@ setup(
             "pytest-xdist>=1.14, <1.15",
             "sphinx>=1.3.5, <1.5",
             "sphinx-autobuild>=0.5.2, <0.7",
-            "sphinxcontrib-documentedlist>=0.3.0, <0.4",
+            "sphinxcontrib-documentedlist>=0.4.0, <0.5",
             "sphinx_rtd_theme>=0.1.9, <0.2",
         ],
         'contentviews': [
diff --git a/tox.ini b/tox.ini
index 38507f277..b39d786c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ setenv =
   TESTS = test/netlib test/pathod/ test/mitmproxy/script test/mitmproxy/test_contentview.py test/mitmproxy/test_custom_contentview.py test/mitmproxy/test_app.py test/mitmproxy/test_controller.py test/mitmproxy/test_fuzzing.py test/mitmproxy/test_script.py test/mitmproxy/test_web_app.py test/mitmproxy/test_utils.py test/mitmproxy/test_stateobject.py test/mitmproxy/test_cmdline.py test/mitmproxy/test_contrib_tnetstring.py test/mitmproxy/test_proxy.py test/mitmproxy/test_protocol_http1.py test/mitmproxy/test_platform_pf.py
 
 [testenv:docs]
-basepython = python2.7
+basepython = python
 whitelist_externals = make
 changedir = docs
 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html