diff options
| author | Jason <jason.daurus@gmail.com> | 2016-06-17 21:54:31 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-06-17 21:54:31 +0800 |
| commit | e4addd60f1ffbb445a8c05f3fb2b6c6e61bd7b93 (patch) | |
| tree | cb5e3be10e8bb813c1ade3aa88204460317d2548 /test/pathod/test_pathoc_cmdline.py | |
| parent | 16a28eca258e07d45c7e2a8ee95368d4eb077d4d (diff) | |
| parent | 9c6199db9be34fad18eaedb86463333671ae190a (diff) | |
| download | mitmproxy-e4addd60f1ffbb445a8c05f3fb2b6c6e61bd7b93.tar.gz mitmproxy-e4addd60f1ffbb445a8c05f3fb2b6c6e61bd7b93.tar.bz2 mitmproxy-e4addd60f1ffbb445a8c05f3fb2b6c6e61bd7b93.zip | |
Merge branch 'master' into websocket
Conflicts:
mitmproxy/web/static/app.css
mitmproxy/web/static/app.js
web/src/js/components/ProxyApp.jsx
Diffstat (limited to 'test/pathod/test_pathoc_cmdline.py')
| -rw-r--r-- | test/pathod/test_pathoc_cmdline.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/pathod/test_pathoc_cmdline.py b/test/pathod/test_pathoc_cmdline.py index 35909325..922cf3a9 100644 --- a/test/pathod/test_pathoc_cmdline.py +++ b/test/pathod/test_pathoc_cmdline.py @@ -1,8 +1,10 @@ -from pathod import pathoc_cmdline as cmdline -import tutils from six.moves import cStringIO as StringIO import mock +from pathod import pathoc_cmdline as cmdline + +from . import tutils + @mock.patch("argparse.ArgumentParser.error") def test_pathoc(perror): |