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_cmdline.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_cmdline.py')
| -rw-r--r-- | pathod/pathod_cmdline.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pathod/pathod_cmdline.py b/pathod/pathod_cmdline.py index 5bb0cdd3..3531b8f3 100644 --- a/pathod/pathod_cmdline.py +++ b/pathod/pathod_cmdline.py @@ -4,8 +4,10 @@ import os import os.path import re -from netlib import tcp, human -from . import pathod, version +from netlib import tcp +from netlib import human +from netlib import version +from . import pathod def parse_anchor_spec(s): |