diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-06-12 11:27:16 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 11:27:16 +1200 |
| commit | e58a2bf0956c6916ebba2477df0320b554c139e2 (patch) | |
| tree | 83934cad2a5918fd7b22a7236985356dfc9cced3 /pathod/pathod.py | |
| parent | dc545ca0f63b63c88dd5bf5d072a3d9b5cc2a2ea (diff) | |
| parent | 1d4403096393369e0a8038ad79434ac26b503de3 (diff) | |
| download | mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.tar.gz mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.tar.bz2 mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.zip | |
Merge branch 'master' into appveyor
Diffstat (limited to 'pathod/pathod.py')
| -rw-r--r-- | pathod/pathod.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pathod/pathod.py b/pathod/pathod.py index d1cc9980..315a04e0 100644 --- a/pathod/pathod.py +++ b/pathod/pathod.py @@ -6,11 +6,14 @@ import sys import threading import urllib -from netlib import tcp, certutils, websockets +from netlib import tcp +from netlib import certutils +from netlib import websockets +from netlib import version from netlib.exceptions import HttpException, HttpReadDisconnect, TcpTimeout, TcpDisconnect, \ TlsException -from . import version, language, utils, log, protocols +from . import language, utils, log, protocols DEFAULT_CERT_DOMAIN = "pathod.net" @@ -486,7 +489,7 @@ def main(args): # pragma: no cover try: print("%s listening on %s" % ( - version.NAMEVERSION, + version.PATHOD, repr(pd.address) )) pd.serve_forever() |