diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-18 17:25:59 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-18 17:25:59 +0100 |
| commit | 0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043 (patch) | |
| tree | 8f80e441b68bba052f4e91d4ac44e43297a8750f /test/tutils.py | |
| parent | 6c24b1d0d2c3a2860d427e84e30d6022b6500320 (diff) | |
| parent | 5acbef236c503bf973a5782dd0139efa977824ea (diff) | |
| download | mitmproxy-0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043.tar.gz mitmproxy-0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043.tar.bz2 mitmproxy-0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043.zip | |
merge master
Diffstat (limited to 'test/tutils.py')
| -rw-r--r-- | test/tutils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/tutils.py b/test/tutils.py index d6332107..fb41d77a 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -1,8 +1,9 @@ import os, shutil, tempfile from contextlib import contextmanager from libmproxy import flow, utils, controller -from libmproxy.console.flowview import FlowView -from libmproxy.console import ConsoleState +if os.name != "nt": + from libmproxy.console.flowview import FlowView + from libmproxy.console import ConsoleState from netlib import certutils from nose.plugins.skip import SkipTest from mock import Mock |