aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/server.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-04 10:51:18 +0100
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-04 10:51:18 +0100
commit023026e032f7f78a53a598eb7bd130d1b14930d2 (patch)
tree01982db6659f75f2bfe737a81b82022550e48e28 /libmproxy/proxy/server.py
parentae4a1dd6dec9d95e450837db8937e3fb7604c121 (diff)
parent98f54d21b6156ceaa8450072be9f53dfde137248 (diff)
downloadmitmproxy-023026e032f7f78a53a598eb7bd130d1b14930d2.tar.gz
mitmproxy-023026e032f7f78a53a598eb7bd130d1b14930d2.tar.bz2
mitmproxy-023026e032f7f78a53a598eb7bd130d1b14930d2.zip
Merge pull request #883 from mitmproxy/hyper-h2
HTTP/2: Implementation using hyper-h2
Diffstat (limited to 'libmproxy/proxy/server.py')
-rw-r--r--libmproxy/proxy/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index 750cb1a4..d208cff5 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -103,9 +103,9 @@ class ConnectionHandler(object):
return Socks5Proxy(root_context)
elif mode == "regular":
return HttpProxy(root_context)
- elif callable(mode): # pragma: nocover
+ elif callable(mode): # pragma: no cover
return mode(root_context)
- else: # pragma: nocover
+ else: # pragma: no cover
raise ValueError("Unknown proxy mode: %s" % mode)
def handle(self):