aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/pathoc.py
diff options
context:
space:
mode:
authorZohar Lorberbaum <zlorber@gmail.com>2016-03-28 10:03:26 -0700
committerZohar Lorberbaum <zlorber@gmail.com>2016-03-28 10:03:26 -0700
commit6d16f44ab723ef23a633b175c1cb4575919b07c4 (patch)
tree2cf1d25543e4e81475aa97207d91a8629ce538dd /pathod/pathoc.py
parente56198ae7cf5de1d00c799133d3257434072998e (diff)
downloadmitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.gz
mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.bz2
mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.zip
Merge with master
Diffstat (limited to 'pathod/pathoc.py')
-rw-r--r--pathod/pathoc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pathod/pathoc.py b/pathod/pathoc.py
index 86661f98..0e6d3ca7 100644
--- a/pathod/pathoc.py
+++ b/pathod/pathoc.py
@@ -208,7 +208,7 @@ class Pathoc(tcp.TCPClient):
self.ws_framereader = None
if self.use_http2:
- if not tcp.HAS_ALPN: # pragma: nocover
+ if not tcp.HAS_ALPN: # pragma: no cover
log.write_raw(
self.fp,
"HTTP/2 requires ALPN support. "
@@ -458,7 +458,7 @@ class Pathoc(tcp.TCPClient):
# TODO: do something
-def main(args): # pragma: nocover
+def main(args): # pragma: no cover
memo = set([])
trycount = 0
p = None