diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-08-01 14:53:34 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-08-01 14:53:34 +0200 |
| commit | ff1e7e64094185205a09eda71ef3c83a9fbcc75c (patch) | |
| tree | 79a6ed20fa026fcec3e65453de9f1387565c5ca6 /test | |
| parent | fa568c2d3bce7639d063e5d94de0aa8b2fcadf0e (diff) | |
| download | mitmproxy-ff1e7e64094185205a09eda71ef3c83a9fbcc75c.tar.gz mitmproxy-ff1e7e64094185205a09eda71ef3c83a9fbcc75c.tar.bz2 mitmproxy-ff1e7e64094185205a09eda71ef3c83a9fbcc75c.zip | |
fix imports for encoding
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_console_common.py | 4 | ||||
| -rw-r--r-- | test/test_console_contentview.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/test_console_common.py b/test/test_console_common.py index 1949dad5..57cbef98 100644 --- a/test/test_console_common.py +++ b/test/test_console_common.py @@ -3,8 +3,10 @@ from nose.plugins.skip import SkipTest if os.name == "nt": raise SkipTest("Skipped on Windows.") +from netlib import encoding + import libmproxy.console.common as common -from libmproxy import utils, flow, encoding +from libmproxy import utils, flow import tutils diff --git a/test/test_console_contentview.py b/test/test_console_contentview.py index b98e1021..d1a6180f 100644 --- a/test/test_console_contentview.py +++ b/test/test_console_contentview.py @@ -5,10 +5,10 @@ if os.name == "nt": import sys import netlib.utils -from netlib import odict +from netlib import odict, encoding import libmproxy.console.contentview as cv -from libmproxy import utils, flow, encoding +from libmproxy import utils, flow import tutils try: |