diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:15 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:15 +1200 |
commit | be644453649f0b0cf84822ad9de566b7dc744873 (patch) | |
tree | 5d743481624d7eb15542d60bbc4909f1defeddb6 /test/netlib/http/test_headers.py | |
parent | a061e4587772f4a87eb43d84f2ed358f7cc98fbd (diff) | |
parent | 898602ad21978951c65aecff7d2e49c49ca10ce2 (diff) | |
download | mitmproxy-be644453649f0b0cf84822ad9de566b7dc744873.tar.gz mitmproxy-be644453649f0b0cf84822ad9de566b7dc744873.tar.bz2 mitmproxy-be644453649f0b0cf84822ad9de566b7dc744873.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'test/netlib/http/test_headers.py')
-rw-r--r-- | test/netlib/http/test_headers.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/netlib/http/test_headers.py b/test/netlib/http/test_headers.py index e12bceaf..51819b86 100644 --- a/test/netlib/http/test_headers.py +++ b/test/netlib/http/test_headers.py @@ -1,5 +1,4 @@ -from netlib.http import Headers -from netlib.http.headers import parse_content_type +from netlib.http import Headers, parse_content_type from netlib.tutils import raises |