aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_server.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2015-08-01 11:38:33 +1200
committerAldo Cortesi <aldo@corte.si>2015-08-01 11:38:33 +1200
commitc31b6c3c36f681d1dbc3ce11922741b7e1e41837 (patch)
treef63a0f56534d16437aaa5464cf585cac82f90985 /test/test_server.py
parentcdc84f52d213cb2b2b2a06a17378ebe757908865 (diff)
parent4f38c6b90e239d192863dee271e267b498c72206 (diff)
downloadmitmproxy-c31b6c3c36f681d1dbc3ce11922741b7e1e41837.tar.gz
mitmproxy-c31b6c3c36f681d1dbc3ce11922741b7e1e41837.tar.bz2
mitmproxy-c31b6c3c36f681d1dbc3ce11922741b7e1e41837.zip
Merge pull request #698 from Kriechi/http2-wip
[WIP] Protocol Refactoring for HTTP/2
Diffstat (limited to 'test/test_server.py')
-rw-r--r--test/test_server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test_server.py b/test/test_server.py
index 066e628a..27b8aad3 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -5,11 +5,11 @@ from OpenSSL import SSL
from netlib import tcp, http, socks
from netlib.certutils import SSLCert
from netlib.http import authentication
+from netlib.http.semantics import CONTENT_MISSING
from libpathod import pathoc, pathod
from libmproxy.proxy.config import HostMatcher
from libmproxy.protocol import KILL, Error
-from libmproxy.protocol.http import CONTENT_MISSING
import tutils
import tservers