diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /test/mock_urwid.py | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'test/mock_urwid.py')
| -rw-r--r-- | test/mock_urwid.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/mock_urwid.py b/test/mock_urwid.py index f132e0bd..191210bf 100644 --- a/test/mock_urwid.py +++ b/test/mock_urwid.py @@ -1,8 +1,10 @@ -import os, sys, mock +import os +import sys +import mock if os.name == "nt": m = mock.Mock() m.__version__ = "1.1.1" m.Widget = mock.Mock m.WidgetWrap = mock.Mock sys.modules['urwid'] = m - sys.modules['urwid.util'] = mock.Mock()
\ No newline at end of file + sys.modules['urwid.util'] = mock.Mock() |