diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-05-05 13:49:20 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-05-05 13:49:20 +1200 |
| commit | 9c13224353eefbb6b1824ded20846036b07c558f (patch) | |
| tree | 8c0f3b8fe06da7526586fd3ad35bbe336d027ad2 | |
| parent | 0ae37c7b797267beb245ed965e57a72375850e98 (diff) | |
| download | mitmproxy-9c13224353eefbb6b1824ded20846036b07c558f.tar.gz mitmproxy-9c13224353eefbb6b1824ded20846036b07c558f.tar.bz2 mitmproxy-9c13224353eefbb6b1824ded20846036b07c558f.zip | |
Fix exception hierarchy.
| -rw-r--r-- | netlib/tcp.py | 4 | ||||
| -rw-r--r-- | test/test_http.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index 07b28cf9..b67ad0bb 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -35,8 +35,8 @@ OP_TLS_ROLLBACK_BUG = SSL.OP_TLS_ROLLBACK_BUG class NetLibError(Exception): pass -class NetLibDisconnect(Exception): pass -class NetLibTimeout(Exception): pass +class NetLibDisconnect(NetLibError): pass +class NetLibTimeout(NetLibError): pass class _FileLike: diff --git a/test/test_http.py b/test/test_http.py index 77cc2624..62d0c3dc 100644 --- a/test/test_http.py +++ b/test/test_http.py @@ -146,7 +146,7 @@ def test_parse_init_connect(): assert not http.parse_init_connect("CONNECT host.com:foo HTTP/1.0") -def test_prase_init_proxy(): +def test_parse_init_proxy(): u = "GET http://foo.com:8888/test HTTP/1.1" m, s, h, po, pa, httpversion = http.parse_init_proxy(u) assert m == "GET" |