diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-06-12 10:40:10 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 10:40:10 +1200 |
| commit | 1d4403096393369e0a8038ad79434ac26b503de3 (patch) | |
| tree | ba21cfd850f1d211bb04ab18a1f18c7c43fc3e03 /pathod/pathod.py | |
| parent | c801f81373d5935f60bf950b1f266911a94ecf60 (diff) | |
| parent | 728d5caa22945d935bee24f39770b10763244cf6 (diff) | |
| download | mitmproxy-1d4403096393369e0a8038ad79434ac26b503de3.tar.gz mitmproxy-1d4403096393369e0a8038ad79434ac26b503de3.tar.bz2 mitmproxy-1d4403096393369e0a8038ad79434ac26b503de3.zip | |
Merge pull request #1246 from cortesi/version
Fold mitmproxy.version and pathod.version into netlib.version
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() |