diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-03-31 18:07:58 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-03-31 18:07:58 +0200 |
| commit | c788e18e03e22bccb7c08eb7ac8283f3732aa50d (patch) | |
| tree | 6cd4f99c6570a5c4e7f00a48f91cba147c5b4974 /pathod | |
| parent | 5552b5e782deaa510ebb00f337e39e99ac452aae (diff) | |
| parent | de0f2cbcd349005a07679283befa2d209bd9d022 (diff) | |
| download | mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.gz mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.bz2 mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.zip | |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'pathod')
| -rw-r--r-- | pathod/pathoc.py | 4 | ||||
| -rw-r--r-- | pathod/pathoc_cmdline.py | 2 | ||||
| -rw-r--r-- | pathod/pathod.py | 2 | ||||
| -rw-r--r-- | pathod/pathod_cmdline.py | 2 | ||||
| -rw-r--r-- | pathod/utils.py | 2 |
5 files changed, 6 insertions, 6 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 diff --git a/pathod/pathoc_cmdline.py b/pathod/pathoc_cmdline.py index bf827a9a..b59704f3 100644 --- a/pathod/pathoc_cmdline.py +++ b/pathod/pathoc_cmdline.py @@ -221,6 +221,6 @@ def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr): return args -def go_pathoc(): # pragma: nocover +def go_pathoc(): # pragma: no cover args = args_pathoc(sys.argv) pathoc.main(args) diff --git a/pathod/pathod.py b/pathod/pathod.py index 55e75074..b80da887 100644 --- a/pathod/pathod.py +++ b/pathod/pathod.py @@ -430,7 +430,7 @@ class Pathod(tcp.TCPServer): return self.log -def main(args): # pragma: nocover +def main(args): # pragma: no cover ssloptions = SSLOptions( cn=args.cn, confdir=args.confdir, diff --git a/pathod/pathod_cmdline.py b/pathod/pathod_cmdline.py index c9272249..1f972a49 100644 --- a/pathod/pathod_cmdline.py +++ b/pathod/pathod_cmdline.py @@ -226,6 +226,6 @@ def args_pathod(argv, stdout_=sys.stdout, stderr_=sys.stderr): return args -def go_pathod(): # pragma: nocover +def go_pathod(): # pragma: no cover args = args_pathod(sys.argv) pathod.main(args) diff --git a/pathod/utils.py b/pathod/utils.py index a1109a3c..1e5bd9a4 100644 --- a/pathod/utils.py +++ b/pathod/utils.py @@ -98,7 +98,7 @@ class Data(object): data = Data(__name__) -def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'): # pragma: nocover +def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'): # pragma: no cover try: pid = os.fork() if pid > 0: |