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_cmdline.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_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): |