aboutsummaryrefslogtreecommitdiffstats
path: root/test/pathod/test_pathoc_cmdline.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-06-17 15:21:57 +0200
committerGitHub <noreply@github.com>2016-06-17 15:21:57 +0200
commit9c6199db9be34fad18eaedb86463333671ae190a (patch)
tree7a4b871c24193d31f8dc23794b0a37f58c111c92 /test/pathod/test_pathoc_cmdline.py
parentfcf5dc8728816bae73a175ee021f8a11a1591567 (diff)
parenteb3ed87100ff7c32e5bf040db7eb6ea3d0c06e12 (diff)
downloadmitmproxy-9c6199db9be34fad18eaedb86463333671ae190a.tar.gz
mitmproxy-9c6199db9be34fad18eaedb86463333671ae190a.tar.bz2
mitmproxy-9c6199db9be34fad18eaedb86463333671ae190a.zip
Merge pull request #1269 from Kriechi/pathod-netlib-http2
move custom HTTP/2 stack from netlib to pathod
Diffstat (limited to 'test/pathod/test_pathoc_cmdline.py')
-rw-r--r--test/pathod/test_pathoc_cmdline.py6
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):