Support Python 3

vfaronov · Oct 17, 2016 · 1ee5940 · 1ee5940
1 parent 126225b
commit 1ee5940
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: python
 
-python: "2.7"
+python:
+    - "2.7"
+    - "3.4"
+    - "3.5"
 
 env:
     - REQUIRES=minimum

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -11,6 +11,7 @@ Unreleased
 ~~~~~~~~~~
 This release is compatible with mitmproxy 0.18+, and **only** 0.18+
 (because mitmproxy 0.18 has a new, backward-incompatible API).
+Note that mitmproxy (and thus mitmproxy-HTTPolice) now supports Python 3.
 
 
 0.3.0 - 2016-08-14

diff --git a/test_real_mitmdump.py b/test_real_mitmdump.py
@@ -24,8 +24,8 @@ def __init__(self):
     def start(self):
         fd, self.report_path = tempfile.mkstemp()
         os.close(fd)
-        script_path = subprocess.check_output(['python', '-m',
-                                               'mitmproxy_httpolice']).strip()
+        script_path = subprocess.check_output(
+            ['python', '-m', 'mitmproxy_httpolice']).decode().strip()
         self.process = subprocess.Popen([
             'mitmdump', '-p', str(self.port), '-s',
             "'%s' '%s'" % (script_path, self.report_path)